fixed some warnings

svn path=/trunk/; revision=19716

diff --git a/reactos/lib/string/bsearch.c b/reactos/lib/string/bsearch.c
index d76db17..873d5cf 100644 (file)
--- a/reactos/lib/string/bsearch.c
+++ b/reactos/lib/string/bsearch.c
@@ -7,19 +7,19 @@ void *
 bsearch(const void *key, const void *base0, size_t nelem,\r
        size_t size, int (*cmp)(const void *ck, const void *ce))\r
 {\r
-  char *base = (char *)base0;\r
+  const char *base = base0;\r
   int lim, cmpval;\r
-  void *p;\r
+  const void *p;\r
 \r
   for (lim = nelem; lim != 0; lim >>= 1)\r
   {\r
     p = base + (lim >> 1) * size;\r
     cmpval = (*cmp)(key, p);\r
     if (cmpval == 0)\r
-      return p;\r
+      return (void*)((size_t)p);\r
     if (cmpval > 0)\r
     {                          /* key > p: move right */\r
-      base = (char *)p + size;\r
+      base = (const char *)p + size;\r
       lim--;\r
     } /* else move left */\r
   }\r

diff --git a/reactos/lib/string/lfind.c b/reactos/lib/string/lfind.c
index 18353a2..ee9a80e 100644 (file)
--- a/reactos/lib/string/lfind.c
+++ b/reactos/lib/string/lfind.c
@@ -5,13 +5,13 @@
 void *_lfind(const void *key, const void *base, size_t *nelp,\r
          size_t width, int (*compar)(const void *, const void *))\r
 {\r
-  char* char_base = (char*)base;\r
+  const char* char_base = (const char *)base;\r
   size_t i;\r
 \r
   for (i = 0; i < *nelp; i++)\r
     {\r
       if (compar(key, char_base) == 0)\r
-       return char_base;\r
+       return (void *)((size_t)char_base);\r
 \r
       char_base += width;\r
     }\r

diff --git a/reactos/lib/string/mbstowcs.c b/reactos/lib/string/mbstowcs.c
index 62f6add..653763f 100644 (file)
--- a/reactos/lib/string/mbstowcs.c
+++ b/reactos/lib/string/mbstowcs.c
@@ -20,7 +20,7 @@ int mbtowc (wchar_t *wchar, const char *mbchar, size_t count)
        Status = RtlMultiByteToUnicodeN (wchar,\r
                                         sizeof(WCHAR),\r
                                         &Size,\r
-                                        (char *)mbchar,\r
+                                        mbchar,\r
                                         count);\r
        if (!NT_SUCCESS(Status))\r
                return -1;\r
@@ -42,7 +42,7 @@ size_t mbstowcs (wchar_t *wcstr, const char *mbstr, size_t count)
        if (wcstr == NULL)\r
        {\r
                RtlMultiByteToUnicodeSize (&Size,\r
-                                          (char *)mbstr,\r
+                                          mbstr,\r
                                           Length);\r
 \r
                return (size_t)Size;\r
@@ -51,7 +51,7 @@ size_t mbstowcs (wchar_t *wcstr, const char *mbstr, size_t count)
        Status = RtlMultiByteToUnicodeN (wcstr,\r
                                         count,\r
                                         &Size,\r
-                                        (char *)mbstr,\r
+                                        mbstr,\r
                                         Length);\r
        if (!NT_SUCCESS(Status))\r
                return -1;\r

diff --git a/reactos/lib/string/splitp.c b/reactos/lib/string/splitp.c
index 041b432..87f3abb 100644 (file)
--- a/reactos/lib/string/splitp.c
+++ b/reactos/lib/string/splitp.c
@@ -4,11 +4,11 @@
  */\r
 void _splitpath(const char* path, char* drive, char* dir, char* fname, char* ext)\r
 {\r
-    char* tmp_drive;\r
-    char* tmp_dir;\r
-    char* tmp_ext;\r
+    const char* tmp_drive;\r
+    const char* tmp_dir;\r
+    const char* tmp_ext;\r
 \r
-    tmp_drive = (char*)strchr(path,':');\r
+    tmp_drive = strchr(path,':');\r
     if (drive) {\r
        if (tmp_drive) {\r
            strncpy(drive,tmp_drive-1,2);\r
@@ -18,7 +18,7 @@ void _splitpath(const char* path, char* drive, char* dir, char* fname, char* ext
        }\r
     }\r
     if (!tmp_drive) {\r
-       tmp_drive = (char*)path - 1;\r
+       tmp_drive = path - 1;\r
     }\r
 \r
     tmp_dir = (char*)strrchr(path,'\\');\r
@@ -31,9 +31,9 @@ void _splitpath(const char* path, char* drive, char* dir, char* fname, char* ext
        }\r
     }\r
 \r
-    tmp_ext = (char*)strrchr(path,'.');\r
+    tmp_ext = strrchr(path,'.');\r
     if (!tmp_ext) {\r
-       tmp_ext = (char*)path+strlen(path);\r
+       tmp_ext = path+strlen(path);\r
     }\r
     if (ext) {\r
         strcpy(ext,tmp_ext);\r

diff --git a/reactos/lib/string/strpbrk.c b/reactos/lib/string/strpbrk.c
index d61f130..dc05fbc 100644 (file)
--- a/reactos/lib/string/strpbrk.c
+++ b/reactos/lib/string/strpbrk.c
@@ -34,17 +34,17 @@ char* strpbrk(const char *s1, const char *s2)
     else
     {
        unsigned long char_map[(1 << CHAR_BIT) / BIT_SIZE] = {0, };
-       register unsigned char* str = (unsigned char*)s1;
+       const unsigned char* str = (const unsigned char*)s1;
        while (*s2)
        {
-          char_map[*(unsigned char*)s2 / BIT_SIZE] |= (1 << (*(unsigned char*)s2 % BIT_SIZE));
+          char_map[*(const unsigned char*)s2 / BIT_SIZE] |= (1 << (*(const unsigned char*)s2 % BIT_SIZE));
           s2++;
        }
        while (*str)
        {
           if (char_map[*str / BIT_SIZE] & (1 << (*str % BIT_SIZE)))
           {
-             return (char*)str;
+             return (char*)((size_t)str);
           }
           str++;
        }

diff --git a/reactos/lib/string/strstr.c b/reactos/lib/string/strstr.c
index 4482a51..7e5127b 100644 (file)
--- a/reactos/lib/string/strstr.c
+++ b/reactos/lib/string/strstr.c
@@ -20,5 +20,5 @@ strstr(const char *s, const char *find)
     } while (strncmp(s, find, len) != 0);
     s--;
   }
-  return (char *)s;
+  return (char *)((size_t)s);
 }

diff --git a/reactos/lib/string/strtol.c b/reactos/lib/string/strtol.c
index dd66a1e..b2538d7 100644 (file)
--- a/reactos/lib/string/strtol.c
+++ b/reactos/lib/string/strtol.c
@@ -85,6 +85,6 @@ strtol(const char *nptr, char **endptr, int base)
   else if (neg)\r
     acc = -acc;\r
   if (endptr != 0)\r
-    *endptr = any ? (char *)s - 1 : (char *)nptr;\r
+    *endptr = any ? (char *)((size_t)(s - 1)) : (char *)((size_t)nptr);\r
   return acc;\r
 }\r

diff --git a/reactos/lib/string/strtoul.c b/reactos/lib/string/strtoul.c
index 9b7c712..359ad0a 100644 (file)
--- a/reactos/lib/string/strtoul.c
+++ b/reactos/lib/string/strtoul.c
@@ -68,6 +68,6 @@ strtoul(const char *nptr, char **endptr, int base)
   else if (neg)\r
     acc = -acc;\r
   if (endptr != 0)\r
-    *endptr = any ? (char *)s - 1 : (char *)nptr;\r
+    *endptr = any ? (char *)((size_t)(s - 1)) : (char *)((size_t)nptr);\r
   return acc;\r
 }\r

diff --git a/reactos/lib/string/strxspn.h b/reactos/lib/string/strxspn.h
index 55750cd..e253927 100644 (file)
--- a/reactos/lib/string/strxspn.h
+++ b/reactos/lib/string/strxspn.h
@@ -7,8 +7,8 @@
 size_t _strxspn(const char *s1, const char *s2)
 {
  unsigned char char_map[1 << CHAR_BIT * sizeof(char)];
- register unsigned char * us2 = (unsigned char *)s2;
- register unsigned char * str = (unsigned char *)s1;
+ const unsigned char * us2 = (const unsigned char *)s2;
+ const unsigned char * str = (const unsigned char *)s1;
 
  memset(char_map, 0, sizeof(char_map));
 
@@ -18,7 +18,7 @@ size_t _strxspn(const char *s1, const char *s2)
  for(; *str; ++ str)
   if(_x(char_map[*str / CHAR_BIT] & (1 << (*str % CHAR_BIT)))) break;
 
- return str - (unsigned char*)s1;
+ return (size_t)str - (size_t)s1;
 }
 
 /* EOF */

diff --git a/reactos/lib/string/wcstol.c b/reactos/lib/string/wcstol.c
index 97fde78..7ea8771 100644 (file)
--- a/reactos/lib/string/wcstol.c
+++ b/reactos/lib/string/wcstol.c
@@ -85,6 +85,6 @@ wcstol(const wchar_t *nptr, wchar_t **endptr, int base)
   else if (neg)\r
     acc = -acc;\r
   if (endptr != 0)\r
-    *endptr = any ? (wchar_t *)s - 1 : (wchar_t *)nptr;\r
+    *endptr = any ? (wchar_t *)((size_t)(s - 1)) : (wchar_t *)((size_t)nptr);\r
   return acc;\r
 }\r

diff --git a/reactos/lib/string/wcstombs.c b/reactos/lib/string/wcstombs.c
index d7cf1b7..e60c191 100644 (file)
--- a/reactos/lib/string/wcstombs.c
+++ b/reactos/lib/string/wcstombs.c
@@ -41,7 +41,7 @@ size_t wcstombs (char *mbstr, const wchar_t *wcstr, size_t count)
        if (mbstr == NULL)\r
        {\r
                RtlUnicodeToMultiByteSize (&Size,\r
-                                          (wchar_t *)wcstr,\r
+                                          (wchar_t*)((size_t)wcstr),\r
                                           Length * sizeof(WCHAR));\r
 \r
                return (size_t)Size;\r
@@ -50,7 +50,7 @@ size_t wcstombs (char *mbstr, const wchar_t *wcstr, size_t count)
        Status = RtlUnicodeToMultiByteN (mbstr,\r
                                         count,\r
                                         &Size,\r
-                                        (wchar_t *)wcstr,\r
+                                        (wchar_t*)((size_t)wcstr),\r
                                         Length * sizeof(WCHAR));\r
        if (!NT_SUCCESS(Status))\r
                return -1;\r

diff --git a/reactos/lib/string/wcstoul.c b/reactos/lib/string/wcstoul.c
index a18f8d9..fd4ff68 100644 (file)
--- a/reactos/lib/string/wcstoul.c
+++ b/reactos/lib/string/wcstoul.c
@@ -69,6 +69,6 @@ wcstoul(const wchar_t *nptr, wchar_t **endptr, int base)
   else if (neg)\r
     acc = -acc;\r
   if (endptr != 0)\r
-    *endptr = any ? (wchar_t *)s - 1 : (wchar_t *)nptr;\r
+    *endptr = any ? (wchar_t *)((size_t)s - 1) : (wchar_t *)((size_t)nptr);\r
   return acc;\r
 }\r

diff --git a/reactos/lib/string/wstring.c b/reactos/lib/string/wstring.c
index 0dfeb8d..758eedf 100644 (file)
--- a/reactos/lib/string/wstring.c
+++ b/reactos/lib/string/wstring.c
@@ -67,11 +67,10 @@ wchar_t *_wcsupr(wchar_t *x)
  */
 size_t wcscspn(const wchar_t *str,const wchar_t *reject)
 {
-       wchar_t *s;
-       wchar_t *t;
-       s=(wchar_t *)str;
+       const wchar_t *t;
+        const wchar_t *s = str;
        do {
-               t=(wchar_t *)reject;
+               t=reject;
                while (*t) {
                        if (*t==*s)
                                break;
@@ -97,7 +96,7 @@ wchar_t *wcspbrk(const wchar_t *s1, const wchar_t *s2)
     for (scanp = s2; (sc = *scanp++) != 0;)
       if (sc == c)
       {
-        return (wchar_t *)(--s1);
+        return (wchar_t *)((size_t)(--s1));
       }
   }
   return 0;
@@ -108,11 +107,10 @@ wchar_t *wcspbrk(const wchar_t *s1, const wchar_t *s2)
  */
 size_t wcsspn(const wchar_t *str,const wchar_t *accept)
 {
-       wchar_t  *s;
-       wchar_t  *t;
-       s=(wchar_t *)str;
+       const wchar_t *t;
+       const wchar_t *s = str;
        do {
-               t=(wchar_t *)accept;
+               t=accept;
                while (*t) {
                        if (*t==*s)
                                break;
@@ -131,20 +129,19 @@ size_t wcsspn(const wchar_t *str,const wchar_t *accept)
  */
 wchar_t *wcsstr(const wchar_t *s,const wchar_t *b)
 {
-       wchar_t *x;
-       wchar_t *y;
-       wchar_t *c;
-       x=(wchar_t *)s;
+       const wchar_t *y;
+       const wchar_t *c;
+       const wchar_t *x = s;
        while (*x) {
                if (*x==*b) {
                        y=x;
-                       c=(wchar_t *)b;
+                       c=b;
                        while (*y && *c && *y==*c) {
                                c++;
                                y++;
                        }
                        if (!*c)
-                               return x;
+                               return (wchar_t *)((size_t)x);
                }
                x++;
        }