yann@1: Fixes following error when building with gcc-3.4.0: yann@1: ../sysdeps/generic/strstr.c: In function `strstr': yann@1: ../sysdeps/generic/strstr.c:85: error: label at end of compound statement yann@1: make[2]: *** [/home/dank/wk/crosstool-0.28-rc4h/build/i686-unknown-linux-gnu/gcc-3.4.0-20040406-glibc-2.1.3/build-glibc/string/strstr.o] Error 1 yann@1: yann@1: yann@1: -------- yann@1: CVSROOT: /cvs/glibc yann@1: Module name: libc yann@1: Changes by: drepper@sources.redhat.com 2000-11-25 23:30:03 yann@1: yann@1: Modified files: yann@1: sysdeps/generic: _strerror.c memrchr.c strcasestr.c strstr.c yann@1: yann@1: Log message: yann@1: Add casts to avoid warnings. yann@1: -------- yann@1: yann@1: Retrieved with yann@1: cvs -z 9 -d :pserver:anoncvs@sources.redhat.com:/cvs/glibc diff -u -D"2000-11-24 23:30:03" -D"2000-11-26 23:30:03" yann@1: then fixed paths and threw out first two hunks yann@1: yann@1: yann@1: #Index: _strerror.c yann@1: #=================================================================== yann@1: #RCS file: /cvs/libc/sysdeps/generic/_strerror.c,v yann@1: #retrieving revision 1.16 yann@1: #retrieving revision 1.17 yann@1: #diff -u -r1.16 -r1.17 yann@1: #--- libc/sysdeps/generic/_strerror.c 29 Aug 2000 01:09:56 -0000 1.16 yann@1: #+++ libc/sysdeps/generic/_strerror.c 26 Nov 2000 07:30:03 -0000 1.17 yann@1: #@@ -56,7 +56,7 @@ yann@1: # buffer size. */ yann@1: # q = __mempcpy (buf, unk, MIN (unklen, buflen)); yann@1: # if (unklen < buflen) yann@1: #- memcpy (q, p, MIN (&numbuf[21] - p, buflen - unklen)); yann@1: #+ memcpy (q, p, MIN ((size_t) (&numbuf[21] - p), buflen - unklen)); yann@1: # yann@1: # /* Terminate the string in any case. */ yann@1: # if (buflen > 0) yann@1: #Index: memrchr.c yann@1: #=================================================================== yann@1: #RCS file: /cvs/libc/sysdeps/generic/memrchr.c,v yann@1: #retrieving revision 1.5 yann@1: #retrieving revision 1.6 yann@1: #diff -u -r1.5 -r1.6 yann@1: #--- libc/sysdeps/generic/memrchr.c 23 Oct 2000 23:07:32 -0000 1.5 yann@1: #+++ libc/sysdeps/generic/memrchr.c 26 Nov 2000 07:30:03 -0000 1.6 yann@1: #@@ -86,7 +86,7 @@ yann@1: # /* All these elucidatory comments refer to 4-byte longwords, yann@1: # but the theory applies equally well to 8-byte longwords. */ yann@1: # yann@1: #- longword_ptr = (unsigned long int *) char_ptr; yann@1: #+ longword_ptr = (const unsigned long int *) char_ptr; yann@1: # yann@1: # /* Bits 31, 24, 16, and 8 of this number are zero. Call these bits yann@1: # the "holes." Note that there is a hole just to the left of yann@1: Index: strcasestr.c yann@1: =================================================================== yann@1: RCS file: /cvs/libc/sysdeps/generic/strcasestr.c,v yann@1: retrieving revision 1.3 yann@1: retrieving revision 1.4 yann@1: diff -u -r1.3 -r1.4 yann@1: --- libc/sysdeps/generic/strcasestr.c 23 Jan 1999 22:16:03 -0000 1.3 yann@1: +++ libc/sysdeps/generic/strcasestr.c 26 Nov 2000 07:30:03 -0000 1.4 yann@1: @@ -1,5 +1,5 @@ yann@1: /* Return the offset of one string within another. yann@1: - Copyright (C) 1994, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. yann@1: + Copyright (C) 1994,1996,1997,1998,1999,2000 Free Software Foundation, Inc. yann@1: This file is part of the GNU C Library. yann@1: yann@1: The GNU C Library is free software; you can redistribute it and/or yann@1: @@ -62,7 +62,7 @@ yann@1: if (c == '\0') yann@1: goto ret0; yann@1: } yann@1: - while (_tolower (c) != b); yann@1: + while (_tolower (c) != (int) b); yann@1: yann@1: c = _tolower (*++needle); yann@1: if (c == '\0') yann@1: @@ -80,40 +80,42 @@ yann@1: a = *++haystack; yann@1: if (a == '\0') yann@1: goto ret0; yann@1: - if (_tolower (a) == b) yann@1: + if (_tolower (a) == (int) b) yann@1: break; yann@1: a = *++haystack; yann@1: if (a == '\0') yann@1: goto ret0; yann@1: -shloop: } yann@1: - while (_tolower (a) != b); yann@1: +shloop: yann@1: + ; yann@1: + } yann@1: + while (_tolower (a) != (int) b); yann@1: yann@1: jin: a = *++haystack; yann@1: if (a == '\0') yann@1: goto ret0; yann@1: yann@1: - if (_tolower (a) != c) yann@1: + if (_tolower (a) != (int) c) yann@1: goto shloop; yann@1: yann@1: rhaystack = haystack-- + 1; yann@1: rneedle = needle; yann@1: a = _tolower (*rneedle); yann@1: yann@1: - if (_tolower (*rhaystack) == a) yann@1: + if (_tolower (*rhaystack) == (int) a) yann@1: do yann@1: { yann@1: if (a == '\0') yann@1: goto foundneedle; yann@1: ++rhaystack; yann@1: a = _tolower (*++needle); yann@1: - if (_tolower (*rhaystack) != a) yann@1: + if (_tolower (*rhaystack) != (int) a) yann@1: break; yann@1: if (a == '\0') yann@1: goto foundneedle; yann@1: ++rhaystack; yann@1: a = _tolower (*++needle); yann@1: } yann@1: - while (_tolower (*rhaystack) == a); yann@1: + while (_tolower (*rhaystack) == (int) a); yann@1: yann@1: needle = rneedle; /* took the register-poor approach */ yann@1: yann@1: Index: strstr.c yann@1: =================================================================== yann@1: RCS file: /cvs/libc/sysdeps/generic/strstr.c,v yann@1: retrieving revision 1.10 yann@1: retrieving revision 1.11 yann@1: diff -u -r1.10 -r1.11 yann@1: --- libc/sysdeps/generic/strstr.c 11 Sep 1997 03:18:20 -0000 1.10 yann@1: +++ libc/sysdeps/generic/strstr.c 26 Nov 2000 07:30:03 -0000 1.11 yann@1: @@ -1,5 +1,5 @@ yann@1: /* Return the offset of one string within another. yann@1: - Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc. yann@1: + Copyright (C) 1994, 1996, 1997, 2000 Free Software Foundation, Inc. yann@1: This file is part of the GNU C Library. yann@1: yann@1: The GNU C Library is free software; you can redistribute it and/or yann@1: @@ -82,7 +82,9 @@ yann@1: a = *++haystack; yann@1: if (a == '\0') yann@1: goto ret0; yann@1: -shloop: } yann@1: +shloop: yann@1: + ; yann@1: + } yann@1: while (a != b); yann@1: yann@1: jin: a = *++haystack;