doxygen用にコメント修正。関数のstatic指定を外す

[YACASL2.git] / src / dumpword.c

diff --git a/src/dumpword.c b/src/dumpword.c
index 7544f25..0bc9a47 100644 (file)
--- a/src/dumpword.c
+++ b/src/dumpword.c
@@ -1,28 +1,31 @@
-#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'},
-    {"help", no_argument, NULL, 'h'},
-    {0, 0, 0, 0},
-};
-
-CERRARRAY cerr[] = {
-    { 114, "not integer" },
-    { 115, "not hex" },
-    { 116, "out of hex range" },
-    { 0, NULL },
+    { "arithmetic", no_argument, NULL, 'a' },
+    { "logical", no_argument, NULL, 'l' },
+    { "help", no_argument, NULL, 'h' },
+    { 0, 0, 0, 0 },
 };
 
+/**
+ * dumpwordコマンドのメイン
+ */
 int main(int argc, char *argv[])
 {
-    bool logicalmode = false;    /* ã\83¬ã\82¸ã\82¹ã\83\88ã\83ªã\81®å\86\85容ã\82\92è«\96ç\90\86å\80¤ï¼\880ã\80\9c65535）で表示する場合はtrue */
+    bool logicalmode = false;    /* ã\83¬ã\82¸ã\82¹ã\83\88ã\83ªã\81®å\86\85容ã\82\92è«\96ç\90\86å\80¤ï¼\880ã\81\8bã\82\8965535）で表示する場合はtrue */
     int opt;
     WORD word;
     const char *usage = "Usage: %s [-alh] WORD\n";
 
+    cerr_init();
     while((opt = getopt_long(argc, argv, "alh", longopts, NULL)) != -1) {
         switch(opt) {
         case 'l':
@@ -43,14 +46,11 @@ 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);
     }
-    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;
 }