Changeset 2286

Timestamp:

Jun 15, 2011 11:00:08 PM (2 years ago)

Author:

wmb

Message:

client library - Use -fno-builtin to eliminate "conflicting type" warnings, and then eliminated the use of size_t in favor of "int", because size_t requires a dependency on external include files.

Location:

clients/lib

Files:

• arm/makefile (modified) (1 diff)
• mem.c (modified) (2 diffs)
• strings.c (modified) (5 diffs)
• types.h (modified) (1 diff)

clients/lib/arm/makefile

@@ -14 +14 @@
 endif
 
-CFLAGS = -I.. -O2 -mcpu=strongarm110
+CFLAGS = -I.. -O2 -mcpu=strongarm110 -fno-builtin
 ifeq (y, $(shell $(CC) -xc -c -fno-stack-protector /dev/null -o /dev/null 2>/dev/null && echo y))
   CFLAGS += -fno-stack-protector

clients/lib/mem.c

@@ -4 +4 @@
 
 VOID
-memcpy(char *to, char *from, size_t len)
+memcpy(char *to, char *from, int len)
 {
         while (len--)
@@ -11 +11 @@
 
 VOID
-memset(char *cp, int c, size_t len)
+memset(char *cp, int c, int len)
 {
         while (len--)

clients/lib/strings.c

@@ -17 +17 @@
 
 int
-strncmp(const char *s, const char *t, size_t len)
+strncmp(const char *s, const char *t, int len)
 {
         int i;
@@ -29 +29 @@
 }
 
-size_t
+int
 strlen(const char *s)
 {
@@ -36 +36 @@
         for (i = 0; s[i] != '\0'; ++i)
                 ;
-        return((size_t) i);
+        return((int) i);
 }
 
-size_t
-strnlen(const char *s, size_t maxlen)
+int
+strnlen(const char *s, int maxlen)
 {
         int i;
@@ -46 +46 @@
         for (i = 0; i < maxlen && s[i] != '\0'; ++i)
                 ;
-        return((size_t) i);
+        return((int) i);
 }
 
@@ -115 +115 @@
 }
 
-void *memchr(const void *s, int c, int len)
+const void *memchr(const void *s, int c, int len)
 {
-        unsigned char *p = s;
+        const unsigned char *p = s;
         while (len--) {
                 if (*p == (unsigned char)c)

clients/lib/types.h

@@ -6 +6 @@
 #define NULL 0
 
-typedef unsigned int size_t;
-
 VOID fatal(char *fmt, ...);