X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Flabel.c;h=f69bd4552921035e57e6efcb0c661d68fab5fa02;hp=de37b9434023e140d7324320c0f42f5825346e88;hb=8365c3016d2564c0498d2dc21300b1bff57e929b;hpb=aac61489b663d7156faba49d9c3e99702dcf9b8c

diff --git a/src/label.c b/src/label.c
index de37b94..f69bd45 100644
--- a/src/label.c
+++ b/src/label.c
@@ -1,10 +1,3 @@
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#include "cerr.h"
-#include "cmem.h"
-#include "hash.h"
 #include "assemble.h"
 
 /**
@@ -70,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);
@@ -101,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;
@@ -154,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)) {
             fprintf(stdout, "%s.", l[i]->prog);
         }
         fprintf(stdout, "%s ---> #%04X\n", l[i]->label, l[i]->adr);
@@ -175,5 +168,6 @@ void freelabel()
             FREE(p->label);
             FREE(p);
         }
+        labels[i] = NULL;
     }
 }