summary refs log tree commit diff
path: root/string/bits
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-03-01 00:35:23 +0000
committerUlrich Drepper <drepper@redhat.com>2005-03-01 00:35:23 +0000
commit61062f56304750c367c5c1533351621353c112a7 (patch)
tree30cff0c1f42e6eb794c5b7e41145e6cc93802d91 /string/bits
parentcffa6970f9785ffcb2a60249b1aca6a2cfde4af3 (diff)
downloadglibc-61062f56304750c367c5c1533351621353c112a7.tar.gz
glibc-61062f56304750c367c5c1533351621353c112a7.tar.xz
glibc-61062f56304750c367c5c1533351621353c112a7.zip
* posix/bits/unistd.h: Avoid calling __*_chk variants if we can
	determine the call will never trigger a failure.

	* sysdeps/i386/i686/memset_chk.S: Remove alias and warning.
	* sysdeps/x86_64/memset_chk.S: Likewise.

2005-02-24  Roland McGrath  <roland@redhat.com>

	* debug/Versions (libc: GLIBC_2.4): Remove
	__memset_zero_constant_len_parameter.
	* sysdeps/generic/memset_chk.c: Remove alias and warning.
	* misc/sys/cdefs.h (__warndecl): New macro.
	* debug/warning-nop.c: New file.
	* string/bits/string3.h (memset): Call __warn_memset_zero_len with no
	arguments, instead of calling __memset_zero_constant_len_parameter.
	Use __warndecl for __warn_memset_zero_len.
	* debug/Makefile (routines): Add $(static-only-routines).
	(static-only-routines): New variable.
Diffstat (limited to 'string/bits')
-rw-r--r--string/bits/string3.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/string/bits/string3.h b/string/bits/string3.h
index 8fb66e41c8..6c027c23a0 100644
--- a/string/bits/string3.h
+++ b/string/bits/string3.h
@@ -85,11 +85,11 @@ __mempcpy_ichk (void *__restrict __dest, const void *__restrict __src,
    especially problematic if the intended fill value is zero.  In this
    case no work is done at all.  We detect these problems by referring
    non-existing functions.  */
-extern char *__memset_zero_constant_len_parameter (void *, int, size_t,
-						   size_t);
+__warndecl (__warn_memset_zero_len,
+	    "memset used with constant zero length parameter; this could be due to transposed parameters");
 #define memset(dest, ch, len) \
   (__builtin_constant_p (len) && (len) == 0				      \
-   ? __memset_zero_constant_len_parameter (dest, ch, len, 0)		      \
+   ? (__warn_memset_zero_len (), (void) (ch), (void) (len), (void *) (dest))  \
    : ((__bos0 (dest) != (size_t) -1)					      \
       ? __builtin___memset_chk (dest, ch, len, __bos0 (dest))		      \
       : __memset_ichk (dest, ch, len)))