Fixes for last commit; version is now 1.10.0.

[rmac] / listing.c

diff --git a/listing.c b/listing.c
index f2c61f6325e6438e2611549457c48507e4a7c0d6..e1fd73a7f42420de4ca0747750edf3d890a80c87 100644 (file)
--- a/listing.c
+++ b/listing.c
@@ -66,9 +66,9 @@ int eject(void)
 //
 // Return GEMDOS format date
 //
-VALUE dos_date(void)
+uint32_t dos_date(void)
 {
-       VALUE v;
+       uint32_t v;
        struct tm * tm;
        time_t tloc;
 
@@ -83,9 +83,9 @@ VALUE dos_date(void)
 //
 // Return GEMDOS format time
 //
-VALUE dos_time(void)
+uint32_t dos_time(void)
 {
-       VALUE v;
+       uint32_t v;
        struct tm * tm;
        time_t tloc;
 
@@ -100,7 +100,7 @@ VALUE dos_time(void)
 //
 // Generate a time string
 //
-void time_string(char * buf, VALUE time)
+void time_string(char * buf, uint32_t time)
 {
        int hour;
        char * ampm;
@@ -123,7 +123,7 @@ void time_string(char * buf, VALUE time)
 //
 // Generate a date string
 //
-void date_string(char * buf, VALUE date)
+void date_string(char * buf, uint32_t date)
 {
        sprintf(buf, "%d-%s-%d",
                (int)(date & 0x1F), month[(date >> 5) & 0xF], (int)((date >> 9) + 1980));
@@ -410,7 +410,7 @@ void lstout(char tag)
 //
 // Output a value to listing
 //
-int listvalue(VALUE v)
+int listvalue(uint32_t v)
 {
        sprintf(buf, "=%08X", v);
        strncpy(lnimage + DATA_COL - 1, buf, 9);
@@ -432,19 +432,19 @@ int d_subttl(void)
        int ejectok;
        ejectok = 1;
 
-       if (*tok == '-')
+       if (*tok.u32 == '-')
        {
                ejectok = 0;
-               ++tok;
+               ++tok.u32;
        }
 
-       if (*tok != STRING)
+       if (*tok.u32 != STRING)
                return error("missing string");
 
-//     strcpy(subttl, (char *)tok[1]);
-       strcpy(subttl, string[tok[1]]);
+//     strcpy(subttl, (char *)tok.u32[1]);
+       strcpy(subttl, string[tok.u32[1]]);
 
-       tok += 2;
+       tok.u32 += 2;
 
        // Always eject on pages 2+
        if (ejectok && (subflag || pageno > 1))
@@ -462,12 +462,12 @@ int d_subttl(void)
 //
 int d_title(void)
 {
-       if (*tok != STRING)
+       if (*tok.u32 != STRING)
                return error("missing string");
 
-//     strcpy(title, (char*)tok[1]);
-       strcpy(title, string[tok[1]]);
-       tok += 2;
+//     strcpy(title, (char*)tok.u32[1]);
+       strcpy(title, string[tok.u32[1]]);
+       tok.u32 += 2;
 
        if (pageno > 1)
        {