bitkeeper revision 1.694 (40133166fMqipwBHlUP1QVHEO6EEOg)

Many files:
  From Kip Macy, we now are stricter when compiling the mini os.

4 files changed, 9 insertions, 18 deletions

diff --git a/extras/mini-os/lib/malloc.c b/extras/mini-os/lib/malloc.c
index c231eb7e86..68af1581cb 100644
--- a/extras/mini-os/lib/malloc.c
+++ b/extras/mini-os/lib/malloc.c
@@ -60,7 +60,7 @@ static void *more_core(size_t n)
     if ( ret )
     {
         num_pages = 1 << order;
-        last = ret + (num_pages * PAGE_SIZE);
+        last = (char *)ret + (num_pages * PAGE_SIZE);
     }
 
     return ret;      
diff --git a/extras/mini-os/lib/math.c b/extras/mini-os/lib/math.c
index 29e1cc933e..be08740965 100644
--- a/extras/mini-os/lib/math.c
+++ b/extras/mini-os/lib/math.c
@@ -140,8 +140,7 @@ shl(register digit *p, register int len, register int sh)
  * leading zeros).
  */
 u64
-__qdivrem(uq, vq, arq)
-	u64 uq, vq, *arq;
+__qdivrem(u64 uq, u64 vq, u64 *arq)
 {
 	union uu tmp;
 	digit *u, *v, *q;
@@ -363,8 +362,7 @@ __divdi3(s64 a, s64 b)
  * Divide two unsigned quads.
  */
 u64
-__udivdi3(a, b)
-        u64 a, b;
+__udivdi3(u64 a, u64 b)
 {
         return (__qdivrem(a, b, (u64 *)0));
 }
@@ -374,8 +372,7 @@ __udivdi3(a, b)
  * Return remainder after dividing two unsigned quads.
  */
 u_quad_t
-__umoddi3(a, b)
-        u_quad_t a, b;
+__umoddi3(u_quad_t a, u_quad_t b)
 {
         u_quad_t r;
 
diff --git a/extras/mini-os/lib/printf.c b/extras/mini-os/lib/printf.c
index bd7beba2c5..698a089c18 100644
--- a/extras/mini-os/lib/printf.c
+++ b/extras/mini-os/lib/printf.c
@@ -130,10 +130,7 @@ vsprintf(char *buf, const char *cfmt, va_list ap)
  * The buffer pointed to by `nbuf' must have length >= MAXNBUF.
  */
 static char *
-ksprintn(nbuf, ul, base, lenp)
-	char *nbuf;
-	u_long ul;
-	int base, *lenp;
+ksprintn(char *nbuf, u_long ul, int base, int *lenp)
 {
 	char *p;
 
@@ -148,10 +145,7 @@ ksprintn(nbuf, ul, base, lenp)
 }
 /* ksprintn, but for a quad_t. */
 static char *
-ksprintqn(nbuf, uq, base, lenp)
-	char *nbuf;
-	u_quad_t uq;
-	int base, *lenp;
+ksprintqn(char *nbuf, u_quad_t uq, int base, int *lenp)
 {
 	char *p;
 
diff --git a/extras/mini-os/lib/string.c b/extras/mini-os/lib/string.c
index c1b9dbfc8e..a00a861316 100644
--- a/extras/mini-os/lib/string.c
+++ b/extras/mini-os/lib/string.c
@@ -35,7 +35,8 @@ int memcmp(const void * cs,const void * ct,size_t count)
 
 void * memcpy(void * dest,const void *src,size_t count)
 {
-	char *tmp = (char *) dest, *s = (char *) src;
+	char *tmp = (char *) dest;
+    const char *s = src;
 
 	while (count--)
 		*tmp++ = *s++;
@@ -120,7 +121,7 @@ char * strchr(const char * s, int c)
         for(; *s != (char) c; ++s)
                 if (*s == '\0')
                         return NULL;
-        return (char *) s;
+        return (char *)s;
 }
 
 char * strstr(const char * s1,const char * s2)
@@ -139,4 +140,3 @@ char * strstr(const char * s1,const char * s2)
         }
         return NULL;
 }
-