Merge branch 'master' of dragon:/home/dav/yacasl2

[YACASL2.git] / test / unit / getcmdtype / getcmdtype.c

diff --git a/test/unit/getcmdtype/getcmdtype.c b/test/unit/getcmdtype/getcmdtype.c
index 9c21994..2c3337c 100644 (file)
--- a/test/unit/getcmdtype/getcmdtype.c
+++ b/test/unit/getcmdtype/getcmdtype.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #include "casl2.h"
 
 int main(){
@@ -15,12 +14,14 @@ int main(){
         0x6400, 0x6500, 0x6600, 0x7000, 0x7100,
         0x8000, 0xF000, 0x8100
     };
+
+    cerr = malloc_chk(sizeof(CERR), "cerr");    /* エラーの初期化 */
     create_code_type();
-    for(i = 0; i < sizeof(codelist)/sizeof(codelist[0]); i++) {
+    for(i = 0; i < ARRAYSIZE(codelist); i++) {
         type = getcmdtype(codelist[i]);
-        printf("0x%04x ---> 0%02o\n", codelist[i], type);
-        if(cerrno != 0) {
-            printf("\t%s", cerrmsg);
+        printf("#%04X ---> 0%02o\n", codelist[i], type);
+        if(cerr->num != 0) {
+            printf("\t%s", cerr->msg);
             freecerr();
         }
     }