projects
/
zilutils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DEFAULT_ZVERSION added instead of magic number.
[zilutils.git]
/
zilasm
/
main.c
diff --git
a/zilasm/main.c
b/zilasm/main.c
index df48b7c86cd9b3cecdbbd0ca8391ec6a4d6b8070..5dbd24020e15bcf663f48b0f5eaea3e57c45d1eb 100644
(file)
--- a/
zilasm/main.c
+++ b/
zilasm/main.c
@@
-28,6
+28,8
@@
#include "config.h"
#include "config.h"
+const int DEFAULT_ZVERSION = 6;
+
enum { ZVERSION = 11, ZORKID, ZSERIAL };
enum { FAIL = -1, OK = 0, NEED_RESTART = 1 };
enum { ZVERSION = 11, ZORKID, ZSERIAL };
enum { FAIL = -1, OK = 0, NEED_RESTART = 1 };
@@
-87,10
+89,11
@@
void print_usage(int failed)
"--version Display program version and exit\n"
"--help Display this help\n"
"\n"
"--version Display program version and exit\n"
"--help Display this help\n"
"\n"
- "--zversion (accepts numbers 1 - 8, defaults to
6
if not specified)\n"
+ "--zversion (accepts numbers 1 - 8, defaults to
%d
if not specified)\n"
"--zorkid (integer between 0 and 65535, defaults to 0 if not specified)\n"
"--serial (six characters of ASCII, defaults to current date\n"
"--zorkid (integer between 0 and 65535, defaults to 0 if not specified)\n"
"--serial (six characters of ASCII, defaults to current date\n"
- " in the form YYMMDD if not specified)\n"
+ " in the form YYMMDD if not specified)\n",
+ DEFAULT_ZVERSION
);
exit(failed);
}
);
exit(failed);
}
@@
-106,8
+109,8
@@
void fill_zserial(void)
void fill_config(void)
{
void fill_config(void)
{
-
Config.zversion = 6
;
- Config.z
orkid = 0
;
+
bzero(&Config, sizeof(Config))
;
+ Config.z
version = DEFAULT_ZVERSION
;
fill_zserial();
}
fill_zserial();
}