X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcmd.c;h=5930ad95def600aabe778747e66468b77a3d7a51;hb=bdbb4708c0434ef7085486c381902f69fbbaf110;hp=f393c9acb8988c297f9ef9a2f1e350554b3e2c5e;hpb=6b30a23640168f0b99e70ad87ab4c5a98015ee02;p=YACASL2.git

diff --git a/src/cmd.c b/src/cmd.c
index f393c9a..5930ad9 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -73,11 +73,11 @@ unsigned hash_cmdtype(const char *cmd, CMDTYPE type)
     unsigned hashval;
 
     /* 命令名を設定 */
-    keys[0] = malloc_chk(sizeof(HKEY *), "hash_cmdtype.keys[0]");
+    keys[0] = malloc_chk(sizeof(HKEY), "hash_cmdtype.keys[0]");
     keys[0]->type = CHARS;
     keys[0]->val.s = strdup_chk(cmd, "keys[0].val.s");
     /* 命令タイプを設定 */
-    keys[1] = malloc_chk(sizeof(HKEY *), "hash_cmdtype.keys[1]");
+    keys[1] = malloc_chk(sizeof(HKEY), "hash_cmdtype.keys[1]");
     keys[1]->type = INT;
     keys[1]->val.i = (int)(type & 070);
     /* ハッシュ値の計算 */
@@ -99,12 +99,12 @@ bool create_cmdtype_code()
     int i;
 
     cmdtabsize = comet2cmdsize;                                            /* ハッシュ表のサイズ */
-    cmdtype_code = calloc_chk(cmdtabsize, sizeof(CMDTAB *), "cmdtype_code");
+    cmdtype_code = calloc_chk(cmdtabsize, sizeof(CMDTAB **), "cmdtype_code");
     for(i = 0; i < comet2cmdsize; i++) {
-        p = malloc_chk(sizeof(CMDTAB *), "create_cmdtype_code.p");
         hashval = hash_cmdtype(comet2cmd[i].name, comet2cmd[i].type);    /* ハッシュ値の生成 */
-        p->next = cmdtype_code[hashval];                                 /* ハッシュ表に値を追加 */
+        p = malloc_chk(sizeof(CMDTAB), "cmdtype_code");
         p->cmd = &comet2cmd[i];
+        p->next = cmdtype_code[hashval];                                 /* ハッシュ表に値を追加 */
         cmdtype_code[hashval] = p;
     }
     return true;
@@ -154,7 +154,7 @@ unsigned hash_code(WORD code)
     unsigned h;
 
     /* 命令コードを設定 */
-    keys[0] = malloc_chk(sizeof(HKEY *), "hash_code.key");
+    keys[0] = malloc_chk(sizeof(HKEY), "hash_code.key");
     keys[0]->type = INT;
     keys[0]->val.i = (int)(code >> 8);
     h = hash(1, keys, cmdtabsize);
@@ -172,12 +172,12 @@ bool create_code_type()
     int i;
 
     cmdtabsize = comet2cmdsize;                    /* ハッシュ表のサイズ */
-    code_type = calloc_chk(comet2cmdsize, sizeof(CMDTAB *), "code_type");
+    code_type = calloc_chk(comet2cmdsize, sizeof(CMDTAB **), "code_type");
     for(i = 0; i < comet2cmdsize; i++) {
-        p = malloc_chk(sizeof(CMDTAB *), "code_type.p");
         hashval = hash_code((&comet2cmd[i])->code);    /* ハッシュ値の生成 */
-        p->next = code_type[hashval];                  /* ハッシュ表に値を追加 */
+        p = malloc_chk(sizeof(CMDTAB), "code_type");
         p->cmd = &comet2cmd[i];
+        p->next = code_type[hashval];                  /* ハッシュ表に値を追加 */
         code_type[hashval] = p;
     }
     return true;