X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fcerr.c;h=24f620d9b19736a06cbc4dea57bda759b4eff66b;hp=069564b46e002cddd29ccbc232d752baf74e0fb0;hb=6b04961e3a699efa011258cc1b1166df71b4c078;hpb=de18494f8acd2f8ca87b86c54bfee1c2094c0d83

diff --git a/src/cerr.c b/src/cerr.c
index 069564b..24f620d 100644
--- a/src/cerr.c
+++ b/src/cerr.c
@@ -42,10 +42,9 @@ bool addcerrlist(int newerrc, CERR newerrv[])
         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");
+        p->cerr = &newerrv[i];
         q = p;
-        p = p->next;
+        p = p->next = malloc_chk(sizeof(CERRLIST), "cerrlist.next");
     }
     q->next = NULL;
     return true;
@@ -89,13 +88,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 +106,13 @@ void freecerr()
 {
     CERRLIST *p = cerrlist, *q;
 
+    /* 現在のエラーメッセージを解放 */
+    free_chk(cerr->msg, "cerr.msg");
+    /* 現在のエラーを解放 */
+    free_chk(cerr, "cerr");
     /* エラーリストを解放 */
-    while(p != NULL) {
+    for(p = cerrlist; p != NULL; p = q) {
         q = p->next;
         free_chk(p, "freecerr.p");
-        p = q;
     }
-    /* 現在のエラーメッセージを解放 */
-    /* free_chk(cerr->msg, "cerr->msg"); */
-    /* 現在のエラーを解放 */
-    free_chk(cerr, "cerr");
 }