diff options
author | Ori Bernstein <ori@eigenstate.org> | 2019-06-21 10:00:58 -0700 |
---|---|---|
committer | Ori Bernstein <ori@eigenstate.org> | 2019-06-21 10:00:58 -0700 |
commit | d4bc9052beb3305d64a353a16641740380eb87af (patch) | |
tree | e90babcf3b3b295d9ad218cbf8f4e852df7e6d89 /sys/src/ape/lib/ap/gen | |
parent | 0af7d1fe35093690f2d8dd0613b3bf3b777674c6 (diff) |
Turn on warnings when building libap.
For ape, we never enabled warnings in cflags.
Turning it on brings up a lot of warnings. Most are noise,
but a few caught unused variables and trunctaions of pointers.
to smaller integers (int, long).
A few warnings remain.
Diffstat (limited to 'sys/src/ape/lib/ap/gen')
-rw-r--r-- | sys/src/ape/lib/ap/gen/getenv.c | 2 | ||||
-rw-r--r-- | sys/src/ape/lib/ap/gen/memchr.c | 2 | ||||
-rw-r--r-- | sys/src/ape/lib/ap/gen/memcmp.c | 4 | ||||
-rw-r--r-- | sys/src/ape/lib/ap/gen/memmove.c | 2 | ||||
-rw-r--r-- | sys/src/ape/lib/ap/gen/mkfile | 2 | ||||
-rw-r--r-- | sys/src/ape/lib/ap/gen/putenv.c | 6 | ||||
-rw-r--r-- | sys/src/ape/lib/ap/gen/rand.c | 2 | ||||
-rw-r--r-- | sys/src/ape/lib/ap/gen/strcspn.c | 2 | ||||
-rw-r--r-- | sys/src/ape/lib/ap/gen/strpbrk.c | 2 | ||||
-rw-r--r-- | sys/src/ape/lib/ap/gen/strrchr.c | 2 | ||||
-rw-r--r-- | sys/src/ape/lib/ap/gen/strspn.c | 2 | ||||
-rw-r--r-- | sys/src/ape/lib/ap/gen/strstr.c | 8 |
12 files changed, 17 insertions, 19 deletions
diff --git a/sys/src/ape/lib/ap/gen/getenv.c b/sys/src/ape/lib/ap/gen/getenv.c index e911d3298..6ff0df06f 100644 --- a/sys/src/ape/lib/ap/gen/getenv.c +++ b/sys/src/ape/lib/ap/gen/getenv.c @@ -6,7 +6,7 @@ char * getenv(const char *name) { char **p = environ; - char *v, *s1, *s2; + char *s1, *s2; while (*p != NULL){ for(s1 = (char *)name, s2 = *p++; *s1 == *s2; s1++, s2++) diff --git a/sys/src/ape/lib/ap/gen/memchr.c b/sys/src/ape/lib/ap/gen/memchr.c index e63aefe8e..dbe440d66 100644 --- a/sys/src/ape/lib/ap/gen/memchr.c +++ b/sys/src/ape/lib/ap/gen/memchr.c @@ -5,7 +5,7 @@ memchr(const void *ap, int c, size_t n) { unsigned char *sp; - sp = ap; + sp = (unsigned char*)ap; c &= 0xFF; while(n > 0) { if(*sp++ == c) diff --git a/sys/src/ape/lib/ap/gen/memcmp.c b/sys/src/ape/lib/ap/gen/memcmp.c index c07fbd0e9..e94ed8052 100644 --- a/sys/src/ape/lib/ap/gen/memcmp.c +++ b/sys/src/ape/lib/ap/gen/memcmp.c @@ -6,8 +6,8 @@ memcmp(const void *a1, const void *a2, size_t n) char *s1, *s2; unsigned c1, c2; - s1 = a1; - s2 = a2; + s1 = (char*)a1; + s2 = (char*)a2; while(n > 0) { c1 = *s1++; c2 = *s2++; diff --git a/sys/src/ape/lib/ap/gen/memmove.c b/sys/src/ape/lib/ap/gen/memmove.c index 7eec93f68..1dacece35 100644 --- a/sys/src/ape/lib/ap/gen/memmove.c +++ b/sys/src/ape/lib/ap/gen/memmove.c @@ -11,7 +11,7 @@ memmove(void *a1, const void *a2, size_t n) if(a1 > a2) goto back; s1 = a1; - s2 = a2; + s2 = (char*)a2; while(n > 0) { *s1++ = *s2++; n--; diff --git a/sys/src/ape/lib/ap/gen/mkfile b/sys/src/ape/lib/ap/gen/mkfile index 54ff7a617..65b62ab13 100644 --- a/sys/src/ape/lib/ap/gen/mkfile +++ b/sys/src/ape/lib/ap/gen/mkfile @@ -63,4 +63,4 @@ OFILES= `{rc ./reduce $O $objtype $ALLOFILES} </sys/src/cmd/mksyslib -CFLAGS=-c -D_POSIX_SOURCE +CFLAGS=$CFLAGS -c -D_POSIX_SOURCE diff --git a/sys/src/ape/lib/ap/gen/putenv.c b/sys/src/ape/lib/ap/gen/putenv.c index 56a1184ba..f92efda3e 100644 --- a/sys/src/ape/lib/ap/gen/putenv.c +++ b/sys/src/ape/lib/ap/gen/putenv.c @@ -9,16 +9,16 @@ putenv(const char *str) int n; for(n = 0; s2 = environ[n]; n++) - for(s1 = str; *s1 == *s2; s1++, s2++) + for(s1 = (char *)str; *s1 == *s2; s1++, s2++) if(*s1 == '\0' || *s1 == '='){ - environ[n] = str; + environ[n] = (char*)str; return 0; } e = realloc(environ, (n+1) * sizeof(char*)); if(e == 0) return -1; environ = e; - e[n++] = str; + e[n++] = (char*)str; e[n] = 0; return 0; } diff --git a/sys/src/ape/lib/ap/gen/rand.c b/sys/src/ape/lib/ap/gen/rand.c index c73ad826c..80127af93 100644 --- a/sys/src/ape/lib/ap/gen/rand.c +++ b/sys/src/ape/lib/ap/gen/rand.c @@ -27,8 +27,6 @@ srand(unsigned int seed) rng_tap = rng_vec; rng_feed = rng_vec+LEN-TAP; seed = seed%M; - if(seed < 0) - seed += M; if(seed == 0) seed = 89482311; x = seed; diff --git a/sys/src/ape/lib/ap/gen/strcspn.c b/sys/src/ape/lib/ap/gen/strcspn.c index f7628e8ae..2aff3336d 100644 --- a/sys/src/ape/lib/ap/gen/strcspn.c +++ b/sys/src/ape/lib/ap/gen/strcspn.c @@ -13,7 +13,7 @@ strcspn(const char *s, const char *b) if(*b++ == 0) break; } - os = s; + os = (char*)s; while(map[*(unsigned char*)s++] == 0) ; return s - os - 1; diff --git a/sys/src/ape/lib/ap/gen/strpbrk.c b/sys/src/ape/lib/ap/gen/strpbrk.c index 407f1c266..b44c73548 100644 --- a/sys/src/ape/lib/ap/gen/strpbrk.c +++ b/sys/src/ape/lib/ap/gen/strpbrk.c @@ -15,6 +15,6 @@ strpbrk(const char *s, const char *b) while(map[*s++] == 0) ; if(*--s) - return s; + return (char*)s; return 0; } diff --git a/sys/src/ape/lib/ap/gen/strrchr.c b/sys/src/ape/lib/ap/gen/strrchr.c index 038b06ad2..d88aa0a51 100644 --- a/sys/src/ape/lib/ap/gen/strrchr.c +++ b/sys/src/ape/lib/ap/gen/strrchr.c @@ -9,6 +9,6 @@ strrchr(const char *s, int c) return strchr(s, 0); r = 0; while(s = strchr(s, c)) - r = s++; + r = (char*)s++; return r; } diff --git a/sys/src/ape/lib/ap/gen/strspn.c b/sys/src/ape/lib/ap/gen/strspn.c index 57ebfd1b5..b7b7bf7ac 100644 --- a/sys/src/ape/lib/ap/gen/strspn.c +++ b/sys/src/ape/lib/ap/gen/strspn.c @@ -10,7 +10,7 @@ strspn(const char *s, const char *b) memset(map, 0, N); while(*b) map[*(unsigned char *)b++] = 1; - os = s; + os = (char*)s; while(map[*(unsigned char *)s++]) ; return s - os - 1; diff --git a/sys/src/ape/lib/ap/gen/strstr.c b/sys/src/ape/lib/ap/gen/strstr.c index 4e6828571..520f992b8 100644 --- a/sys/src/ape/lib/ap/gen/strstr.c +++ b/sys/src/ape/lib/ap/gen/strstr.c @@ -2,19 +2,19 @@ /* Return pointer to first occurrence of s2 in s1, NULL if none */ -char -*strstr(const char *s1, const char *s2) +char* +strstr(const char *s1, const char *s2) { char *p, *pa, *pb; int c0, c; c0 = *s2; if(c0 == 0) - return s1; + return (char *)s1; s2++; for(p=strchr(s1, c0); p; p=strchr(p+1, c0)) { pa = p; - for(pb=s2;; pb++) { + for(pb=(char*)s2;; pb++) { c = *pb; if(c == 0) return p; |