変数名の整理

[YACASL2.git] / src / dumpword.c

diff --git a/src/dumpword.c b/src/dumpword.c
index a3c6a36..073dd3e 100644 (file)
--- a/src/dumpword.c
+++ b/src/dumpword.c
@@ -9,13 +9,6 @@ static struct option longopts[] = {
     {0, 0, 0, 0},
 };
 
-CERRARRAY cerr[] = {
-    { 114, "not integer" },
-    { 115, "not hex" },
-    { 116, "out of hex range" },
-    { 0, NULL },
-};
-
 int main(int argc, char *argv[])
 {
     bool logicalmode = false;    /* レジストリの内容を論理値（0〜65535）で表示する場合はtrue */
@@ -23,6 +16,7 @@ int main(int argc, char *argv[])
     WORD word;
     const char *usage = "Usage: %s [-alh] WORD\n";
 
+    cerr = malloc_chk(sizeof(CERR), "cerr");
     while((opt = getopt_long(argc, argv, "alh", longopts, NULL)) != -1) {
         switch(opt) {
         case 'l':
@@ -43,8 +37,8 @@ int main(int argc, char *argv[])
     }
     /* WORD値に変換 */
     word = nh2word(argv[optind]);
-    if(cerrno > 0) {
-        fprintf(stderr, "Dumpword Error - %d: %s\n", cerrno, cerrmsg);
+    if(cerr->num > 0) {
+        fprintf(stderr, "Dumpword Error - %d: %s\n", cerr->num, cerr->msg);
         exit(-1);
     }
     fprintf(stdout, "%6s: ", argv[optind]);