icode comments need space

[fw/sdcc] / link / z80 / lkmain.c

diff --git a/link/z80/lkmain.c b/link/z80/lkmain.c
index e92f59943dc7d8d1b95de6f5602684fc041828fb..745504b8495c52eac4e17914b8c009e08610c404 100644 (file)
--- a/link/z80/lkmain.c
+++ b/link/z80/lkmain.c
@@ -14,8 +14,9 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <alloc.h>
+//#include <alloc.h>
 #include "aslink.h"
+#include <stdlib.h>
 
 #ifndef SDK_VERSION_STRING
 #define SDK_VERSION_STRING     "3.0.0"
@@ -157,12 +158,12 @@ char *default_globlp[] = {
 };
 #endif /* GAMEBOY */
 
-VOID
+int
 main(argc, argv)
 char *argv[];
 {
        register char *p;
-       register c, i;
+       register int c, i;
 
 #ifdef GAMEBOY
        nb_rom_banks = 2;
@@ -243,7 +244,7 @@ char *argv[];
                        }
                }
        }
-       if (startp->f_type == NULL)
+       if (startp->f_type == F_INV)
                usage();
        if (startp->f_type == F_LNK && startp->f_idp == NULL)
                usage();
@@ -261,7 +262,7 @@ char *argv[];
                        break;
                if (pflag && sfp != stdin)
                        fprintf(stdout, "%s\n", ip);
-               if (*ip == NULL || parse())
+               if (*ip == '\0' || parse())
                        break;
        }
        if (sfp)
@@ -376,6 +377,9 @@ char *argv[];
                }
        }
        lkexit(lkerr);
+
+        /* Never get here. */
+        return 0;
 }
 
 /*)Function    VOID    lkexit(i)
@@ -449,7 +453,7 @@ int i;
 VOID
 link()
 {
-       register c;
+       register int c;
 
        if ((c=endline()) == 0) { return; }
        switch (c) {
@@ -681,7 +685,6 @@ map()
 #else
 VOID map()
 {
-       register i;
        register struct head *hdp;
        register struct lbfile *lbfh;
 
@@ -772,12 +775,11 @@ VOID map()
 #endif /* MLH_MAP */
 
 #ifdef SDK
+/* PENDING */
+VOID lstareatosym(struct area *xp);
+
 VOID sym()
 {
-       register i;
-       register struct head *hdp;
-       register struct lbfile *lbfh;
-
        /*
         * Open sym File
         */
@@ -849,7 +851,7 @@ VOID sym()
 int
 parse()
 {
-       register c;
+       register int c;
        char fid[NINPUT];
 
        while ((c = getnb()) != 0) {
@@ -891,8 +893,6 @@ parse()
                                                        while(get() != '"')
                                                                ;
                                        } else if(c == 'P' || c == 'p') {
-                                               unsigned int addr;
-                                               unsigned char value;
                                                patch *p = patches;
 
                                                patches = (patch *)malloc(sizeof(patch));
@@ -1075,7 +1075,7 @@ bassav()
  *             int     lkerr           error flag
  *
  *      functions called:
- *             addr_t  expr()          lkeval.c
+ *             Addr_T  expr()          lkeval.c
  *             int     fprintf()       c_library
  *             VOID    getid()         lklex.c
  *             char    getnb()         lklex.c
@@ -1088,7 +1088,7 @@ bassav()
 VOID
 setbas()
 {
-       register v;
+       register int v;
        char id[NCPS];
 
        bsp = basep;
@@ -1185,7 +1185,7 @@ gblsav()
  *             int     lkerr           error flag
  *
  *      functions called:
- *             addr_t  expr()          lkeval.c
+ *             Addr_T  expr()          lkeval.c
  *             int     fprintf()       c_library
  *             VOID    getid()         lklex.c
  *             char    getnb()         lklex.c
@@ -1198,7 +1198,7 @@ gblsav()
 VOID
 setgbl()
 {
-       register v;
+       register int v;
        register struct sym *sp;
        char id[NCPS];
 
@@ -1280,7 +1280,7 @@ char *fn;
 char *ft;
 {
        register char *p1, *p2, *p3;
-       register c;
+       register int c;
        FILE *fp;
        char fb[FILSPC];