/**
* エラーリスト
*/
-CERRLIST *cerrlist;
+CERRLIST *cerrlist = NULL;
/**
* エラーリストを作成または追加する
*/
-bool addcerrlist(int newerrc, CERR newerrv[])
+void addcerrlist(int errc, CERR errv[])
{
int i;
- CERRLIST *p, *q;
+ CERRLIST *p = NULL, *q = malloc_chk(sizeof(CERRLIST), "cerrlist");
- assert(newerrc > 0 && newerrv != NULL);
- if(cerrlist == NULL) {
- p = cerrlist = malloc_chk(sizeof(CERRLIST), "cerrlist");
- } else {
- for(p = cerrlist; p != NULL; p = p->next) {
- q = p;
+ assert(errc > 0 && errv != NULL);
+ for(i = 0; i < errc; i++) {
+ if(p == NULL) {
+ p = q;
+ } else {
+ p = p->next = malloc_chk(sizeof(CERRLIST), "cerrlist.next");
}
- p = q->next = malloc_chk(sizeof(CERRLIST), "cerrlist.next");
- }
- for(i = 0; i < newerrc; i++) {
- p->cerr = &newerrv[i];
- q = p;
- p = p->next = malloc_chk(sizeof(CERRLIST), "cerrlist.next");
+ p->cerr = &errv[i];
+ p->next = NULL;
}
- q->next = NULL;
- return true;
+ p->next = cerrlist;
+ cerrlist = q;
}
/**
cerr->num = num;
/* 現在のエラーメッセージを設定 */
cerr->msg = malloc_chk(CERRMSGSIZE + 1, "cerr.msg");
- if(str != NULL && strlen(str) <= CERRSTRSIZE) {
+ if(0 < strlen(str) && strlen(str) <= CERRSTRSIZE) {
sprintf(cerr->msg, "%s: %s", str, getcerrmsg(cerr->num));
} else {
strcpy(cerr->msg, getcerrmsg(cerr->num));
CERRLIST *p = cerrlist, *q;
/* 現在のエラーメッセージを解放 */
- free_chk(cerr->msg, "cerr.msg");
+ FREE(cerr->msg);
/* 現在のエラーを解放 */
- free_chk(cerr, "cerr");
+ FREE(cerr);
/* エラーリストを解放 */
for(p = cerrlist; p != NULL; p = q) {
q = p->next;
- free_chk(p, "freecerr.p");
+ FREE(p);
}
}