Blame SOURCES/glibc-rh1505492-prototypes-debug.patch
|
|
c6d234 |
Convert __stpcpy_chk and __strcpy_chk to prototype-style function
|
|
|
c6d234 |
definitions. Upstream, this happened as part of:
|
|
|
c6d234 |
|
|
|
c6d234 |
commit 0d0325ed4b1052f32069eb3a51f7e16485a73568
|
|
|
c6d234 |
Author: Ondřej Bílka <neleai@seznam.cz>
|
|
|
c6d234 |
Date: Tue Aug 25 12:23:24 2015 +0200
|
|
|
c6d234 |
|
|
|
c6d234 |
Fix strcpy_chk and stpcpy_chk performance.
|
|
|
c6d234 |
|
|
|
c6d234 |
diff --git a/debug/stpcpy_chk.c b/debug/stpcpy_chk.c
|
|
|
c6d234 |
index 3934d132d930093c..ba8058051857ef16 100644
|
|
|
c6d234 |
--- a/debug/stpcpy_chk.c
|
|
|
c6d234 |
+++ b/debug/stpcpy_chk.c
|
|
|
c6d234 |
@@ -24,10 +24,7 @@
|
|
|
c6d234 |
|
|
|
c6d234 |
/* Copy SRC to DEST, returning the address of the terminating '\0' in DEST. */
|
|
|
c6d234 |
char *
|
|
|
c6d234 |
-__stpcpy_chk (dest, src, destlen)
|
|
|
c6d234 |
- char *dest;
|
|
|
c6d234 |
- const char *src;
|
|
|
c6d234 |
- size_t destlen;
|
|
|
c6d234 |
+__stpcpy_chk (char *dest, const char *src, size_t destlen)
|
|
|
c6d234 |
{
|
|
|
c6d234 |
char *d = dest;
|
|
|
c6d234 |
const char *s = src;
|
|
|
c6d234 |
diff --git a/debug/strcpy_chk.c b/debug/strcpy_chk.c
|
|
|
c6d234 |
index ee22b11cd33afdde..7cbe14a327dc7992 100644
|
|
|
c6d234 |
--- a/debug/strcpy_chk.c
|
|
|
c6d234 |
+++ b/debug/strcpy_chk.c
|
|
|
c6d234 |
@@ -23,10 +23,7 @@
|
|
|
c6d234 |
|
|
|
c6d234 |
/* Copy SRC to DEST with checking of destination buffer overflow. */
|
|
|
c6d234 |
char *
|
|
|
c6d234 |
-__strcpy_chk (dest, src, destlen)
|
|
|
c6d234 |
- char *dest;
|
|
|
c6d234 |
- const char *src;
|
|
|
c6d234 |
- size_t destlen;
|
|
|
c6d234 |
+__strcpy_chk (char *dest, const char *src, size_t destlen)
|
|
|
c6d234 |
{
|
|
|
c6d234 |
char c;
|
|
|
c6d234 |
char *s = (char *) src;
|