シフト変換のコードをリファクタリング

[YACASL2.git] / src / dumpword.c

diff --git a/src/dumpword.c b/src/dumpword.c
index f907eac..7544f25 100644 (file)
--- a/src/dumpword.c
+++ b/src/dumpword.c
@@ -9,13 +9,20 @@ 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 */
     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':
@@ -35,7 +42,7 @@ int main(int argc, char *argv[])
         exit(-1);
     }
     /* WORD値に変換 */
-    word = a2word(argv[optind]);
+    word = nh2word(argv[optind]);
     if(cerrno > 0) {
         fprintf(stderr, "Dumpword Error - %d: %s\n", cerrno, cerrmsg);
         exit(-1);