From: Jason Self <j@jxself.org>
Date: Tue, 6 Oct 2015 22:00:36 +0000 (-0700)
Subject: DEFAULT_ZVERSION added instead of magic number.
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=093225c7cb864aaa31567969301eb5f36bd9a5f4;p=zilutils.git

DEFAULT_ZVERSION added instead of magic number.
---

diff --git a/zilasm/main.c b/zilasm/main.c
index df48b7c..5dbd240 100644
--- a/zilasm/main.c
+++ b/zilasm/main.c
@@ -28,6 +28,8 @@
 
 #include "config.h"
 
+const int DEFAULT_ZVERSION = 6;
+
 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"
-           "--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"
-           "            in the form YYMMDD if not specified)\n"
+           "            in the form YYMMDD if not specified)\n",
+           DEFAULT_ZVERSION
           );
     exit(failed);
 }
@@ -106,8 +109,8 @@ void fill_zserial(void)
 
 void fill_config(void)
 {
-    Config.zversion = 6;
-    Config.zorkid   = 0;
+    bzero(&Config, sizeof(Config));
+    Config.zversion = DEFAULT_ZVERSION;
     fill_zserial();
 }