X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdumpword.c;h=dea7d9bbf5a21521c0eed294f6ff86c544eed7ce;hb=b3f91f53a0a715249df3582be19d064f831619a0;hp=dd49cd5be22d0af4b4b0561bd2a34524a370da3e;hpb=288d61424576d1aae956ea8e4b5fb89dc25909db;p=YACASL2.git

diff --git a/src/dumpword.c b/src/dumpword.c
index dd49cd5..dea7d9b 100644
--- a/src/dumpword.c
+++ b/src/dumpword.c
@@ -1,7 +1,13 @@
-#include "casl2.h"
 #define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
 #include <getopt.h>
+#include "word.h"
+#include "cerr.h"
 
+/**
+ * dumpwordコマンドのオプション
+ */
 static struct option longopts[] = {
     { "arithmetic", no_argument, NULL, 'a' },
     { "logical", no_argument, NULL, 'l' },
@@ -9,14 +15,18 @@ static struct option longopts[] = {
     { 0, 0, 0, 0 },
 };
 
+/**
+ * dumpwordコマンドのメイン
+ */
 int main(int argc, char *argv[])
 {
-    bool logicalmode = false;    /* レジストリの内容を論理値（0〜65535）で表示する場合はtrue */
+    bool logicalmode = false;    /* レジストリの内容を論理値（0から65535）で表示する場合はtrue */
     int opt;
     WORD word;
     const char *usage = "Usage: %s [-alh] WORD\n";
 
     cerr_init();
+    addcerrlist_word();
     while((opt = getopt_long(argc, argv, "alh", longopts, NULL)) != -1) {
         switch(opt) {
         case 'l':
@@ -27,19 +37,19 @@ int main(int argc, char *argv[])
             return 0;
         case '?':
             fprintf(stderr, usage, argv[0]);
-            exit(-1);
+            exit(1);
         }
     }
 
     if(argv[optind] == NULL) {
         fprintf(stderr, usage, argv[0]);
-        exit(-1);
+        exit(1);
     }
     /* WORD値に変換 */
     word = nh2word(argv[optind]);
     if(cerr->num > 0) {
         fprintf(stderr, "Dumpword Error - %d: %s\n", cerr->num, cerr->msg);
-        exit(-1);
+        exit(1);
     }
     fprintf(stdout, "%6s: ", argv[optind]);
     print_dumpword(word, logicalmode);