Clean up some macro defs and usage

git-svn-id: https://s.snth.net/svn/neverball/trunk@3344 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/ball/demo.c b/ball/demo.c
index c4931ff..99884d0 100644 (file)
--- a/ball/demo.c
+++ b/ball/demo.c
@@ -35,10 +35,10 @@
 
 /*---------------------------------------------------------------------------*/
 
-#define MAGIC (0xAF | 'N' << 8 | 'B' << 16 | 'R' << 24)
+#define DEMO_MAGIC (0xAF | 'N' << 8 | 'B' << 16 | 'R' << 24)
 #define DEMO_VERSION 9
 
-#define DATELEN 20
+#define DATELEN sizeof ("YYYY-MM-DDTHH:MM:SS")
 
 fs_file demo_fp;
 
@@ -58,7 +58,7 @@ static int demo_header_read(fs_file fp, struct demo *d)
 
     get_index(fp, &t);
 
-    if (magic == MAGIC && version == DEMO_VERSION && t)
+    if (magic == DEMO_MAGIC && version == DEMO_VERSION && t)
     {
         d->timer = t;
 
@@ -67,7 +67,7 @@ static int demo_header_read(fs_file fp, struct demo *d)
         get_index(fp, &d->mode);
 
         get_string(fp, d->player, sizeof (d->player));
-        get_string(fp, datestr, DATELEN);
+        get_string(fp, datestr, sizeof (datestr));
 
         sscanf(datestr,
                "%d-%d-%dT%d:%d:%d",
@@ -101,13 +101,13 @@ static int demo_header_read(fs_file fp, struct demo *d)
 
 static void demo_header_write(fs_file fp, struct demo *d)
 {
-    int magic = MAGIC;
+    int magic = DEMO_MAGIC;
     int version = DEMO_VERSION;
     int zero  = 0;
 
     char datestr[DATELEN];
 
-    strftime(datestr, DATELEN, "%Y-%m-%dT%H:%M:%S", gmtime(&d->date));
+    strftime(datestr, sizeof (datestr), "%Y-%m-%dT%H:%M:%S", gmtime(&d->date));
 
     put_index(fp, magic);
     put_index(fp, version);

diff --git a/share/solid.c b/share/solid.c
index 4285b3f..4e25564 100644 (file)
--- a/share/solid.c
+++ b/share/solid.c
@@ -28,7 +28,7 @@ enum
     SOL_VER_CURRENT = SOL_VER_PATH_FLAGS
 };
 
-#define MAGIC (0xAF | 'S' << 8 | 'O' << 16 | 'L' << 24)
+#define SOL_MAGIC (0xAF | 'S' << 8 | 'O' << 16 | 'L' << 24)
 
 /*---------------------------------------------------------------------------*/
 
@@ -42,8 +42,8 @@ static int sol_file(fs_file fin)
     get_index(fin, &magic);
     get_index(fin, &version);
 
-    if (magic != MAGIC || (version < SOL_VER_MINIMUM ||
-                           version > SOL_VER_CURRENT))
+    if (magic != SOL_MAGIC || (version < SOL_VER_MINIMUM ||
+                               version > SOL_VER_CURRENT))
         return 0;
 
     sol_version = version;
@@ -541,7 +541,7 @@ static void sol_stor_dict(fs_file fout, struct s_dict *dp)
 static void sol_stor_file(fs_file fout, struct s_file *fp)
 {
     int i;
-    int magic   = MAGIC;
+    int magic   = SOL_MAGIC;
     int version = SOL_VER_CURRENT;
 
     put_index(fout, magic);