X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flabel.c;h=9d34f771791053cb4e0fc5921def7ebe939c1181;hb=8521d91eea4d77630d668ad269dc0634f4a426ff;hp=63b6fe5dec797bd90c07aff0aab8fcfcb09e9aee;hpb=9f54a56b4d6a4c2e09529a5e71ad0d84afa1ce45;p=YACASL2.git

diff --git a/src/label.c b/src/label.c
index 63b6fe5..9d34f77 100644
--- a/src/label.c
+++ b/src/label.c
@@ -63,7 +63,7 @@ unsigned labelhash(const char *prog, const char *label)
     int i = 0, j;
     unsigned h;
 
-    if(*prog != '\0') {
+    if(prog[0]) {
         keys[i++] = label_hashkey(prog);
     }
     keys[i] = label_hashkey(label);
@@ -94,7 +94,7 @@ WORD getlabel(const char *prog, const char *label)
 
     for(p = labels[labelhash(prog, label)]; p != NULL; p = p->next) {
         l = p->label;
-        if((*prog == '\0' || (strcmp(prog, l->prog) == 0)) &&
+        if((!prog[0] || (strcmp(prog, l->prog) == 0)) &&
            strcmp(label, l->label) == 0)
         {
             return l->adr;
@@ -147,7 +147,7 @@ void printlabel()
     }
     qsort(l, s, sizeof(*l), compare_adr);
     for(i = 0; i < s; i++) {
-        if(*(l[i]->prog) != '\0') {
+        if(l[i]->prog[0]) {
             fprintf(stdout, "%s.", l[i]->prog);
         }
         fprintf(stdout, "%s ---> #%04X\n", l[i]->label, l[i]->adr);
@@ -166,10 +166,8 @@ void freelabel()
             FREE(p->label->prog);
             FREE(p->label->label);
             FREE(p->label);
-            if(p == labels[i]) {
-                labels[i] = NULL;
-            }
             FREE(p);
         }
+        labels[i] = NULL;
     }
 }