projects
/
YACASL2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
テストの修正
[YACASL2.git]
/
src
/
cerr.c
diff --git
a/src/cerr.c
b/src/cerr.c
index
f1cb09c
..
455ab5b
100644
(file)
--- a/
src/cerr.c
+++ b/
src/cerr.c
@@
-1,8
+1,3
@@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <stdbool.h>
#include "cerr.h"
void cerr_init()
#include "cerr.h"
void cerr_init()
@@
-11,32
+6,32
@@
void cerr_init()
cerr->num = 0;
}
cerr->num = 0;
}
-CERR *cerr;
+CERR *cerr
= NULL
;
CERRLIST *cerrlist = NULL;
void addcerrlist(int cerrc, CERR cerrv[])
{
CERRLIST *cerrlist = NULL;
void addcerrlist(int cerrc, CERR cerrv[])
{
-
int i
;
- CERRLIST *p = NULL
, *q = malloc_chk(sizeof(CERRLIST), "cerrlist")
;
+
CERRLIST *stat = NULL
;
+ CERRLIST *p = NULL;
assert(cerrc > 0 && cerrv != NULL);
assert(cerrc > 0 && cerrv != NULL);
- for(i = 0; i < cerrc; i++) {
+ for(i
nt i
= 0; i < cerrc; i++) {
if(p == NULL) {
if(p == NULL) {
-
p = q
;
+
stat = p = malloc_chk(sizeof(CERRLIST), "cerrlist")
;
} else {
} else {
- p = p->next = malloc_chk(sizeof(CERRLIST), "cerrlist
.
next");
+ p = p->next = malloc_chk(sizeof(CERRLIST), "cerrlist
->
next");
}
p->cerr = &cerrv[i];
p->next = NULL;
}
p->next = cerrlist;
}
p->cerr = &cerrv[i];
p->next = NULL;
}
p->next = cerrlist;
- cerrlist =
q
;
+ cerrlist =
stat
;
}
void printcerrlist()
{
}
void printcerrlist()
{
- CERRLIST *p;
+ CERRLIST *p
= NULL
;
if(cerrlist == NULL) {
puts("error list is null.");
if(cerrlist == NULL) {
puts("error list is null.");
@@
-62,7
+57,7
@@
void setcerr(int num, const char *str)
char *getcerrmsg(int num)
{
char *getcerrmsg(int num)
{
- CERRLIST *p;
+ CERRLIST *p
= NULL
;
char *msg = "unknown error";
for(p = cerrlist; p != NULL; p = p->next) {
char *msg = "unknown error";
for(p = cerrlist; p != NULL; p = p->next) {
@@
-76,7
+71,8
@@
char *getcerrmsg(int num)
void freecerr()
{
void freecerr()
{
- CERRLIST *p = cerrlist, *q;
+ CERRLIST *p = NULL;
+ CERRLIST *q = NULL;
/* 現在のエラーメッセージを解放 */
FREE(cerr->msg);
/* 現在のエラーメッセージを解放 */
FREE(cerr->msg);