X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcerr.c;h=116312b11cb671cca78144eaa24754b8f4a59aeb;hb=d28cabe954c1f93dee3cb1b100e614e985a74cdb;hp=6b9ab402bf2415a43f28c2526129ae2187118f49;hpb=6b30a23640168f0b99e70ad87ab4c5a98015ee02;p=YACASL2.git

diff --git a/src/cerr.c b/src/cerr.c
index 6b9ab40..116312b 100644
--- a/src/cerr.c
+++ b/src/cerr.c
@@ -10,7 +10,7 @@
  */
 void cerr_init()
 {
-    cerr = malloc_chk(sizeof(CERR *), "cerr");
+    cerr = malloc_chk(sizeof(CERR), "cerr");
     cerr->num = 0;
 }
 
@@ -30,14 +30,14 @@ CERRLIST *cerrlist = NULL;
 void addcerrlist(int errc, CERR errv[])
 {
     int i;
-    CERRLIST *p = NULL, *q = malloc_chk(sizeof(CERRLIST *), "cerrlist");
+    CERRLIST *p = NULL, *q = malloc_chk(sizeof(CERRLIST), "cerrlist");
 
     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 = p->next = malloc_chk(sizeof(CERRLIST), "cerrlist.next");
         }
         p->cerr = &errv[i];
         p->next = NULL;
@@ -71,7 +71,7 @@ void setcerr(int num, const char *str)
     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));