More fixups to remove warnings, removal of more cruft.

[rmac] / 68kgen.c

diff --git a/68kgen.c b/68kgen.c
index 51a7361a85edd4894b72bb4e8edb3ca5f7e85a98..23da319429c9c443e8c7aac2c3e9264b03c5e32b 100644 (file)
--- a/68kgen.c
+++ b/68kgen.c
@@ -10,17 +10,18 @@
 #include <ctype.h>
 #include <stdlib.h>
 
+
 #define        EOS     '\0'
 
 int kwnum = 1;                 /* current op# for kwgen output */
-
-FILE * kfp;                    /* keyword file */
-
+FILE * kfp;                            /* keyword file */
 int lineno = 0;
 
+// Function prototypes
 void error(char *, char *);
 void procln(int, char **);
 
+
 int main(int argc, char ** argv)
 {
        char * namv[256];
@@ -28,15 +29,13 @@ int main(int argc, char ** argv)
        int namcnt;
        char ln[256];
 
-       if (argc == 2)
-               if ((kfp = fopen(argv[1], "w")) == NULL)
-                       error("Cannot create: %s", argv[1]);
+       if ((argc == 2) && ((kfp = fopen(argv[1], "w")) == NULL))
+               error("Cannot create: %s", argv[1]);
 
-//     while (gets(ln) != NULL)
        while (fgets(ln, 256, stdin) != NULL)
        {
-
                ++lineno;                       /* bump line# */
+
                if (*ln == '#')         /* ignore comments */
                        continue;
 
@@ -66,6 +65,7 @@ int main(int argc, char ** argv)
                if (namcnt)
                        procln(namcnt, namv);
        }
+
        return 0;
 }
 
@@ -99,6 +99,7 @@ void procln(int namc, char ** namv)
                printf("CGSPECIAL");
        else for (s = namv[1], i=0; *s; ++s)
                printf("%sSIZ%c", (i++ ? "|" : ""), *s);
+
        printf(", %s, %s, ", namv[2], namv[3]);
 
        if (*namv[4] == '%')            /* enforce little fascist percent signs */
@@ -126,6 +127,7 @@ void procln(int namc, char ** namv)
        ++kwnum;
 }
 
+
 void error(char * s, char * s1)
 {
        fprintf(stderr, s, s1);