projects
/
YACASL2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
comet2monitorの修正
[YACASL2.git]
/
src
/
dumpword.c
diff --git
a/src/dumpword.c
b/src/dumpword.c
index
d39dfaf
..
05cfe9a
100644
(file)
--- a/
src/dumpword.c
+++ b/
src/dumpword.c
@@
-1,13
+1,8
@@
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include "word.h"
-#include "cerr.h"
#include "package.h"
#include "package.h"
+#include "word.h"
/**
/**
- * dumpwordコマンドのオプション
+ *
@brief
dumpwordコマンドのオプション
*/
static struct option longopts[] = {
{ "arithmetic", no_argument, NULL, 'a' },
*/
static struct option longopts[] = {
{ "arithmetic", no_argument, NULL, 'a' },
@@
-18,7
+13,12
@@
static struct option longopts[] = {
};
/**
};
/**
- * dumpwordコマンドのメイン
+ * @brief dumpwordコマンドのメイン
+ *
+ * @return 正常終了時は0、エラー発生時は1
+ *
+ * @param argc コマンドライン引数の数
+ * @param *argv[] コマンドライン引数の配列
*/
int main(int argc, char *argv[])
{
*/
int main(int argc, char *argv[])
{
@@
-28,8
+28,6
@@
int main(int argc, char *argv[])
const char *version = PACKAGE_VERSION, *cmdversion = "dumpword of YACASL2 version %s\n";
const char *usage = "Usage: %s [-alh] WORD\n";
const char *version = PACKAGE_VERSION, *cmdversion = "dumpword of YACASL2 version %s\n";
const char *usage = "Usage: %s [-alh] WORD\n";
- cerr_init();
- addcerrlist_word();
while((opt = getopt_long(argc, argv, "alvh", longopts, NULL)) != -1) {
switch(opt) {
case 'l':
while((opt = getopt_long(argc, argv, "alvh", longopts, NULL)) != -1) {
switch(opt) {
case 'l':
@@
-47,17
+45,25
@@
int main(int argc, char *argv[])
}
}
}
}
+ /* エラーの定義 */
+ cerr_init();
+ addcerrlist_word();
+
if(argv[optind] == NULL) {
fprintf(stderr, usage, argv[0]);
if(argv[optind] == NULL) {
fprintf(stderr, usage, argv[0]);
+ freecerr();
exit(1);
}
/* WORD値に変換 */
word = nh2word(argv[optind]);
if(cerr->num > 0) {
fprintf(stderr, "Dumpword Error - %d: %s\n", cerr->num, cerr->msg);
exit(1);
}
/* WORD値に変換 */
word = nh2word(argv[optind]);
if(cerr->num > 0) {
fprintf(stderr, "Dumpword Error - %d: %s\n", cerr->num, cerr->msg);
+ freecerr();
exit(1);
}
fprintf(stdout, "%6s: ", argv[optind]);
print_dumpword(word, logicalmode);
exit(1);
}
fprintf(stdout, "%6s: ", argv[optind]);
print_dumpword(word, logicalmode);
+ fprintf(stdout, "\n");
+ freecerr();
return 0;
}
return 0;
}