X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdumpword.c;h=7e7d00a9a6990adef32c9cea6a548c0ceca8dea1;hb=2d3d185962d2997a08cd2e674868cea35b99ae04;hp=1a8a73ee22d959010504c0609f79988713306374;hpb=406fd6490ad76b4573b6ce9f8d322d92f13d27d8;p=YACASL2.git

diff --git a/src/dumpword.c b/src/dumpword.c
index 1a8a73e..7e7d00a 100644
--- a/src/dumpword.c
+++ b/src/dumpword.c
@@ -1,12 +1,14 @@
-#include "casl2.h"
 #define _GNU_SOURCE
 #include <getopt.h>
+#include "word.h"
+#include "cerr.h"
+#include "cmem.h"
 
 static struct option longopts[] = {
-    {"arithmetic", no_argument, NULL, 'a'},
-    {"logical", no_argument, NULL, 'l'},
-    {"help", no_argument, NULL, 'h'},
-    {0, 0, 0, 0},
+    { "arithmetic", no_argument, NULL, 'a' },
+    { "logical", no_argument, NULL, 'l' },
+    { "help", no_argument, NULL, 'h' },
+    { 0, 0, 0, 0 },
 };
 
 int main(int argc, char *argv[])
@@ -16,6 +18,7 @@ int main(int argc, char *argv[])
     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':
@@ -36,8 +39,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]);