malloc周りの修正

[YACASL2.git] / src / cerr.c

diff --git a/src/cerr.c b/src/cerr.c
index 069564b..ae35d57 100644 (file)
--- a/src/cerr.c
+++ b/src/cerr.c
@@ -22,33 +22,28 @@ CERR *cerr;
 /**
  * エラーリスト
  */
-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]);
-        p->next = malloc_chk(sizeof(CERRLIST), "cerrlist.next");
-        q = p;
-        p = p->next;
+        p->cerr = &errv[i];
+        p->next = NULL;
     }
-    q->next = NULL;
-    return true;
+    p->next = cerrlist;
+    cerrlist = q;
 }
 
 /**
@@ -89,13 +84,15 @@ void setcerr(int num, const char *str)
 char *getcerrmsg(int num)
 {
     CERRLIST *p;
+    char *msg = "unknown error";
 
     for(p = cerrlist; p != NULL; p = p->next) {
         if(num == p->cerr->num) {
-            return p->cerr->msg;
+            msg = p->cerr->msg;
+            break;
         }
     }
-    return "unknown error";
+    return msg;
 }
 
 /**
@@ -105,14 +102,13 @@ void freecerr()
 {
     CERRLIST *p = cerrlist, *q;
 
+    /* 現在のエラーメッセージを解放 */
+    FREE(cerr->msg);
+    /* 現在のエラーを解放 */
+    FREE(cerr);
     /* エラーリストを解放 */
-    while(p != NULL) {
+    for(p = cerrlist; p != NULL; p = q) {
         q = p->next;
-        free_chk(p, "freecerr.p");
-        p = q;
+        FREE(p);
     }
-    /* 現在のエラーメッセージを解放 */
-    /* free_chk(cerr->msg, "cerr->msg"); */
-    /* 現在のエラーを解放 */
-    free_chk(cerr, "cerr");
 }