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

diff --git a/src/label.c b/src/label.c
index ece8d58..cbb27b8 100644
--- a/src/label.c
+++ b/src/label.c
@@ -1,11 +1,3 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include "cerr.h"
-#include "cmem.h"
-#include "hash.h"
 #include "assemble.h"
 
 /**
@@ -116,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) {
@@ -135,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;
 }