X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Flabel.c;h=cbb27b815d1ac720d630f394573cbe4511da3c9c;hp=2a39f41f090afecf794416d295489209fe84358a;hb=a46594d66972fae37a609506bcf01f6b2bdc865e;hpb=fa032895bbf1893f1037c3329c037755866d4785

diff --git a/src/label.c b/src/label.c
index 2a39f41..cbb27b8 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"
 
 /**
@@ -115,7 +108,7 @@ bool addlabel(const char *prog, const char *label, WORD adr)
     assert(label != NULL);
     LABELTAB *p;
     LABELARRAY *l;
-    unsigned hashval;
+    unsigned h;
 
     /* 登録されたラベルを検索。すでに登録されている場合はエラー発生 */
     if(getlabel(prog, label) != 0xFFFF) {
@@ -134,9 +127,8 @@ bool addlabel(const char *prog, const char *label, WORD adr)
     /* ラベル数を設定 */
     labelcnt++;
     /* ハッシュ表へ追加 */
-    hashval = labelhash(prog, label);
-    p->next = labels[hashval];
-    labels[hashval] = p;
+    p->next = labels[h = labelhash(prog, label)];
+    labels[h] = p;
     return true;
 }