X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=test%2Funit%2Fprint_code_type%2Fprint_code_type.c;h=0a5a3128d7cc35415a5ccda963629600ff76c74e;hp=179160bb7fca1ca37199335ccd815e3eeb96e8f4;hb=c5e30b2f26ebc174c49c52c67121f3be81b5bd43;hpb=2b0ff8e75f11c5fb58e16e95d8195d6f1252c97c

diff --git a/test/unit/print_code_type/print_code_type.c b/test/unit/print_code_type/print_code_type.c
index 179160b..0a5a312 100644
--- a/test/unit/print_code_type/print_code_type.c
+++ b/test/unit/print_code_type/print_code_type.c
@@ -3,36 +3,42 @@
 
 int compare_code(const void *a, const void *b)
 {
-    return (**(const CMDCODEARRAY **)a).code - (**(const CMDCODEARRAY **)b).code;
+    return (**(const CMD **)a).code - (**(const CMD **)b).code;
 }
 
 /* 命令コードがキーのハッシュ表を表示する */
 void print_code_type()
 {
     int i, j = 0;
-    CMDCODETAB *np;
-    CMDCODEARRAY **ar;
-    ar = malloc(sizeof(*ar) * cmdcodesize);
+    CMDTAB *np;
+    CMD **ar;
+    ar = malloc(sizeof(*ar) * comet2cmdsize);
     for(i = 0; i < cmdtabsize; i++) {
         np = code_type[i];
         while(np != NULL) {
-            ar[j++] = np->cca;
+            ar[j++] = np->cmd;
             np = np->next;
         }
     }
-    qsort(ar, cmdcodesize, sizeof(*ar), (int (*)(const void*, const void*))compare_code);
-    for(i = 0; i < cmdcodesize; i++) {
-        fprintf(stdout, "#%04X\t0%02o\t%s\n", ar[i]->code, ar[i]->type, ar[i]->cmd);
+    qsort(ar, comet2cmdsize, sizeof(*ar), (int (*)(const void*, const void*))compare_code);
+    for(i = 0; i < comet2cmdsize; i++) {
+        fprintf(stdout, "#%04X\t0%02o\t%s\n", ar[i]->code, ar[i]->type, ar[i]->name);
     }
 }
 
 int main()
 {
+    /* エラーの初期化 */
+    cerr = malloc_chk(sizeof(CERR), "cerr");
+    /* ハッシュ表作成 */
     create_code_type();
+    /* 命令表表示 */
     print_code_type();
+    /* ハッシュ表削除 */
     free_code_type();
-    if(cerrno != 0) {
-        printf("\terror - %d: %s\n", cerrno, cerrmsg);
+    /* エラーの表示 */
+    if(cerr->num != 0) {
+        printf("\terror - %d: %s\n", cerr->num, cerr->msg);
         freecerr();
         exit(-1);
     }