X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdumpword.c;h=1a8a73ee22d959010504c0609f79988713306374;hb=5562b8293058464957a1f833777e187a78220ed5;hp=cefbc0f8a17ad81e09f75ddcf5a1919a94b6441e;hpb=2f889a87ef4e11467f71ea3c03676a8d88cccd7b;p=YACASL2.git

diff --git a/src/dumpword.c b/src/dumpword.c
index cefbc0f..1a8a73e 100644
--- a/src/dumpword.c
+++ b/src/dumpword.c
@@ -9,23 +9,13 @@ static struct option longopts[] = {
     {0, 0, 0, 0},
 };
 
-CERRARRAY cerr[] = {
-    { 114, "not integer" },
-    { 115, "not hex" },
-    { 116, "out of hex range" },
-    { 0, NULL },
-};
-
-/* レジストリの内容を論理値（0〜65535）で表示する場合はtrue */
-bool logicalmode = false;
-
 int main(int argc, char *argv[])
 {
+    bool logicalmode = false;    /* レジストリの内容を論理値（0〜65535）で表示する場合はtrue */
     int opt;
     WORD word;
     const char *usage = "Usage: %s [-alh] WORD\n";
 
-    logicalmode = false;
     while((opt = getopt_long(argc, argv, "alh", longopts, NULL)) != -1) {
         switch(opt) {
         case 'l':
@@ -50,10 +40,7 @@ int main(int argc, char *argv[])
         fprintf(stderr, "Dumpword Error - %d: %s\n", cerrno, cerrmsg);
         exit(-1);
     }
-    if(logicalmode == true) {
-        fprintf(stdout, "%6s: %6d = #%04X = %s\n", argv[optind], word, word, word2bit(word));
-    } else {
-        fprintf(stdout, "%6s: %6d = #%04X = %s\n", argv[optind], (short)word, word, word2bit(word));
-    }
+    fprintf(stdout, "%6s: ", argv[optind]);
+    print_dumpword(word, logicalmode);
     return 0;
 }