| From a0cb13bdd98a941b81fdafe4cd96e4c569feb651 Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Fri, 29 Mar 2013 08:52:36 +0400 |
| Subject: [PATCH 12/35] libmudflap-susv3-legacy |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| |
| Upstream-Status: Inappropriate [embedded specific] |
| --- |
| libmudflap/mf-hooks2.c | 10 +++++----- |
| 1 file changed, 5 insertions(+), 5 deletions(-) |
| |
| diff --git a/libmudflap/mf-hooks2.c b/libmudflap/mf-hooks2.c |
| index 4af17df..a3c6b2f 100644 |
| --- a/libmudflap/mf-hooks2.c |
| +++ b/libmudflap/mf-hooks2.c |
| @@ -424,7 +424,7 @@ WRAPPER2(void, bzero, void *s, size_t n) |
| { |
| TRACE ("%s\n", __PRETTY_FUNCTION__); |
| MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region"); |
| - bzero (s, n); |
| + memset (s, 0, n); |
| } |
| |
| |
| @@ -434,7 +434,7 @@ WRAPPER2(void, bcopy, const void *src, void *dest, size_t n) |
| TRACE ("%s\n", __PRETTY_FUNCTION__); |
| MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src"); |
| MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest"); |
| - bcopy (src, dest, n); |
| + memmove (dest, src, n); |
| } |
| |
| |
| @@ -444,7 +444,7 @@ WRAPPER2(int, bcmp, const void *s1, const void *s2, size_t n) |
| TRACE ("%s\n", __PRETTY_FUNCTION__); |
| MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg"); |
| MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg"); |
| - return bcmp (s1, s2, n); |
| + return n == 0 ? 0 : memcmp (s1, s2, n); |
| } |
| |
| |
| @@ -453,7 +453,7 @@ WRAPPER2(char *, index, const char *s, int c) |
| size_t n = strlen (s); |
| TRACE ("%s\n", __PRETTY_FUNCTION__); |
| MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region"); |
| - return index (s, c); |
| + return strchr (s, c); |
| } |
| |
| |
| @@ -462,7 +462,7 @@ WRAPPER2(char *, rindex, const char *s, int c) |
| size_t n = strlen (s); |
| TRACE ("%s\n", __PRETTY_FUNCTION__); |
| MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region"); |
| - return rindex (s, c); |
| + return strrchr (s, c); |
| } |
| |
| /* XXX: stpcpy, memccpy */ |
| -- |
| 1.7.10.4 |
| |