From 096bffb5e2bf6cfd2afe2b235d15120ec337d3b6 Mon Sep 17 00:00:00 2001 From: michaelh Date: Thu, 28 Jun 2001 01:52:33 +0000 Subject: [PATCH] Removed all warnings from as and link git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@975 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- as/z80/asexpr.c | 4 ++-- as/z80/assym.c | 4 ++-- as/z80/z80adr.c | 8 ++++---- link/Makefile | 1 - link/z80/aslink.h | 6 ++++++ link/z80/lkeval.c | 2 ++ link/z80/lklist.c | 4 ++-- link/z80/lkmain.c | 13 +++++++++---- link/z80/lkrloc.c | 4 +++- link/z80/lksym.c | 6 ++++-- 10 files changed, 34 insertions(+), 18 deletions(-) diff --git a/as/z80/asexpr.c b/as/z80/asexpr.c index e6fa421c..2664550d 100644 --- a/as/z80/asexpr.c +++ b/as/z80/asexpr.c @@ -273,7 +273,7 @@ register struct expr *esp; char id[NCPS]; struct sym *sp; struct tsym *tp; - int r, v; + int r = 0, v; c = getnb(); /* @@ -347,7 +347,7 @@ register struct expr *esp; if (ctype[c] & DIGIT) { esp->e_mode = S_USER; jp = ip; - while (ctype[*jp] & RAD10) { + while (ctype[(unsigned char)(*jp)] & RAD10) { jp++; } if (*jp == '$') { diff --git a/as/z80/assym.c b/as/z80/assym.c index f57f5f99..1ef7cc76 100644 --- a/as/z80/assym.c +++ b/as/z80/assym.c @@ -353,7 +353,7 @@ register char *p1, *p2; if (*p1++ != *p2++) return (0); #else - if (ccase[*p1++] != ccase[*p2++]) + if (ccase[(unsigned char)(*p1++)] != ccase[(unsigned char)(*p2++)]) return (0); #endif @@ -396,7 +396,7 @@ register char *p; #if CASE_SENSITIVE h += *p++; #else - h += ccase[*p++]; + h += ccase[(unsigned char)(*p++)]; #endif } while (--n); diff --git a/as/z80/z80adr.c b/as/z80/z80adr.c index f0d428ec..d47b8eba 100644 --- a/as/z80/z80adr.c +++ b/as/z80/z80adr.c @@ -37,7 +37,7 @@ int addr(esp) register struct expr *esp; { - register int c, mode, indx; + register int c, mode = 0, indx; if ((c = getnb()) == '#') { expr(esp, 0); @@ -62,7 +62,7 @@ register struct expr *esp; esp->e_mode = S_INDM; } if (indx) { - esp->e_mode = mode + indx&0xFF; + esp->e_mode = (mode + indx)&0xFF; esp->e_base.e_ap = NULL; } if ((c = getnb()) != RTIND) @@ -159,12 +159,12 @@ register char *str; } #else while (*ptr && *str) { - if (ccase[*ptr] != ccase[*str]) + if (ccase[(unsigned char)(*ptr)] != ccase[(unsigned char)(*str)]) break; ptr++; str++; } - if (ccase[*ptr] == ccase[*str]) { + if (ccase[(unsigned char)(*ptr)] == ccase[(unsigned char)(*str)]) { ip = ptr; return(1); } diff --git a/link/Makefile b/link/Makefile index 1b9ce652..213d6095 100644 --- a/link/Makefile +++ b/link/Makefile @@ -10,6 +10,5 @@ all: clean: $(MAKE) -C z80 clean - # dummy install target to prevent warnings install: diff --git a/link/z80/aslink.h b/link/z80/aslink.h index 47a03a48..9ef08c54 100644 --- a/link/z80/aslink.h +++ b/link/z80/aslink.h @@ -150,6 +150,7 @@ /* * File types */ +#define F_INV 0 /* invalid */ #define F_STD 1 /* stdin */ #define F_LNK 2 /* File.lnk */ #define F_REL 3 /* File.rel */ @@ -712,3 +713,8 @@ extern VOID s19(); /* lkihx.c */ extern VOID ihx(); + +/* lkgb.h */ +VOID gb(int in); +VOID gg(int in); + diff --git a/link/z80/lkeval.c b/link/z80/lkeval.c index 183e54b2..2dff89be 100644 --- a/link/z80/lkeval.c +++ b/link/z80/lkeval.c @@ -303,6 +303,8 @@ term() return(symval(sp)); } } + /* Shouldn't get here. */ + return 0; } /*)Function int digit(c, r) diff --git a/link/z80/lklist.c b/link/z80/lklist.c index ff892b1b..6b9b1c58 100644 --- a/link/z80/lklist.c +++ b/link/z80/lklist.c @@ -337,7 +337,7 @@ VOID lstarea(struct area *xp) register struct areax *oxp; register int i, j; int nmsym; - Addr_T a0, ai, aj; + Addr_T a0, ai = 0, aj = 0; struct sym *sp; struct sym **p; @@ -1263,7 +1263,7 @@ char *str; int i; for (i=0; i //#include #include "aslink.h" +#include #ifndef SDK_VERSION_STRING #define SDK_VERSION_STRING "3.0.0" @@ -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) @@ -771,6 +775,9 @@ VOID map() #endif /* MLH_MAP */ #ifdef SDK +/* PENDING */ +VOID lstareatosym(struct area *xp); + VOID sym() { /* @@ -886,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)); diff --git a/link/z80/lkrloc.c b/link/z80/lkrloc.c index 0f2d6ad0..0746dbbe 100644 --- a/link/z80/lkrloc.c +++ b/link/z80/lkrloc.c @@ -15,7 +15,9 @@ #include #include +#include //#include +#include #include "aslink.h" /*)Module lkrloc.c @@ -251,7 +253,7 @@ relr() register int mode; register Addr_T reli, relv; int aindex, rindex, rtp, error; - Addr_T r, rtbase, rtofst, paga, pags, pc; + Addr_T r, rtbase, rtofst, paga = 0, pags = 0, pc; struct areax **a; struct sym **s; diff --git a/link/z80/lksym.c b/link/z80/lksym.c index 19c80ee1..8699da8e 100644 --- a/link/z80/lksym.c +++ b/link/z80/lksym.c @@ -175,7 +175,9 @@ newsym() } fprintf(stderr, "Header symbol list overflow\n"); lkexit(1); + /* Never reached */ + return 0; } /*)Function sym * lkpsym(id,f) @@ -401,7 +403,7 @@ register char *p1, *p2; if (*p1++ != *p2++) return (0); #else - if (ccase[*p1++] != ccase[*p2++]) + if (ccase[(unsigned char)(*p1++)] != ccase[(unsigned char)(*p2++)]) return (0); #endif @@ -445,7 +447,7 @@ register char *p; #if CASE_SENSITIVE h += *p++; #else - h += ccase[*p++]; + h += ccase[(unsigned char)(*p++)]; #endif } while (--n); -- 2.30.2