static int comet2cmdsize = ARRAYSIZE(comet2cmd);
/**
- * 命令表のサイズ
+ * ハッシュ表のサイズ
*/
static int cmdtabsize;
keys[1]->val.i = (int)(type & 070);
/* ハッシュ値の計算 */
hashval = hash(2, keys, cmdtabsize);
- free_chk(keys[0]->val.s, "keys[0].val.s");
- free_chk(keys[0], "keys[0]");
- free_chk(keys[1], "keys[1]");
+ FREE(keys[0]->val.s);
+ FREE(keys[0]);
+ FREE(keys[1]);
/* ハッシュ値を返す */
return hashval;
}
unsigned hashval;
int i;
- cmdtabsize = comet2cmdsize;
- cmdtype_code = calloc_chk(cmdtabsize, sizeof(CMDTAB *), "cmdtype_code");
+ cmdtabsize = comet2cmdsize; /* ハッシュ表のサイズ */
+ cmdtype_code = calloc_chk(cmdtabsize, sizeof(CMDTAB **), "cmdtype_code");
for(i = 0; i < comet2cmdsize; i++) {
- p = malloc_chk(sizeof(CMDTAB), "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;
WORD getcmdcode(const char *cmd, CMDTYPE type)
{
CMDTAB *p;
+ WORD w = 0xFFFF;
assert(cmd != NULL);
- for(p = cmdtype_code[hash_cmdtype(cmd, type)]; p != NULL; p = p->next){
+ for(p = cmdtype_code[hash_cmdtype(cmd, type)]; p != NULL; p = p->next) {
if(strcmp(cmd, p->cmd->name) == 0 && type == p->cmd->type) {
- return p->cmd->code;
+ w = p->cmd->code;
+ break;
}
}
- return 0xFFFF;
+ return w;
}
/**
for(i = 0; i < cmdtabsize; i++) {
for(p = cmdtype_code[i]; p != NULL; p = q) {
q = p->next;
- free_chk(p, "free_cmdtype_code.p");
+ FREE(p);
}
}
- free_chk(cmdtype_code, "cmdtype_code");
}
/**
unsigned hash_code(WORD code)
{
HKEY *keys[1];
+ unsigned h;
/* 命令コードを設定 */
keys[0] = malloc_chk(sizeof(HKEY), "hash_code.key");
keys[0]->type = INT;
keys[0]->val.i = (int)(code >> 8);
- /* ハッシュ値を返す */
- return hash(1, keys, cmdtabsize);
+ h = hash(1, keys, cmdtabsize);
+ FREE(keys[0]);
+ return h;
}
/**
unsigned hashval;
int i;
- cmdtabsize = comet2cmdsize;
- code_type = calloc_chk(cmdtabsize, sizeof(CMDTAB *), "code_type");
+ cmdtabsize = comet2cmdsize; /* ハッシュ表のサイズ */
+ 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;
CMDTYPE getcmdtype(WORD code)
{
CMDTAB *p;
+ CMDTYPE t = NOTCMD;
+
for(p = code_type[hash_code(code)]; p != NULL; p = p->next) {
if(code == p->cmd->code) {
- return p->cmd->type;
+ t = p->cmd->type;
+ break;
}
}
- return NOTCMD;
+ return t;
}
/**
int i;
CMDTAB *p, *q;
for(i = 0; i < cmdtabsize; i++) {
- p = code_type[i];
- while(p != NULL) {
+ for(p = code_type[i]; p != NULL; p = q) {
q = p->next;
- free_chk(p, "code_type.p");
- p = q;
+ FREE(p);
}
}
- free_chk(code_type, "code_type");
}