Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From a0cb13bdd98a941b81fdafe4cd96e4c569feb651 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 29 Mar 2013 08:52:36 +0400 |
| 4 | Subject: [PATCH 12/35] libmudflap-susv3-legacy |
| 5 | |
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 7 | |
| 8 | Upstream-Status: Inappropriate [embedded specific] |
| 9 | --- |
| 10 | libmudflap/mf-hooks2.c | 10 +++++----- |
| 11 | 1 file changed, 5 insertions(+), 5 deletions(-) |
| 12 | |
| 13 | diff --git a/libmudflap/mf-hooks2.c b/libmudflap/mf-hooks2.c |
| 14 | index 4af17df..a3c6b2f 100644 |
| 15 | --- a/libmudflap/mf-hooks2.c |
| 16 | +++ b/libmudflap/mf-hooks2.c |
| 17 | @@ -424,7 +424,7 @@ WRAPPER2(void, bzero, void *s, size_t n) |
| 18 | { |
| 19 | TRACE ("%s\n", __PRETTY_FUNCTION__); |
| 20 | MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region"); |
| 21 | - bzero (s, n); |
| 22 | + memset (s, 0, n); |
| 23 | } |
| 24 | |
| 25 | |
| 26 | @@ -434,7 +434,7 @@ WRAPPER2(void, bcopy, const void *src, void *dest, size_t n) |
| 27 | TRACE ("%s\n", __PRETTY_FUNCTION__); |
| 28 | MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src"); |
| 29 | MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest"); |
| 30 | - bcopy (src, dest, n); |
| 31 | + memmove (dest, src, n); |
| 32 | } |
| 33 | |
| 34 | |
| 35 | @@ -444,7 +444,7 @@ WRAPPER2(int, bcmp, const void *s1, const void *s2, size_t n) |
| 36 | TRACE ("%s\n", __PRETTY_FUNCTION__); |
| 37 | MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg"); |
| 38 | MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg"); |
| 39 | - return bcmp (s1, s2, n); |
| 40 | + return n == 0 ? 0 : memcmp (s1, s2, n); |
| 41 | } |
| 42 | |
| 43 | |
| 44 | @@ -453,7 +453,7 @@ WRAPPER2(char *, index, const char *s, int c) |
| 45 | size_t n = strlen (s); |
| 46 | TRACE ("%s\n", __PRETTY_FUNCTION__); |
| 47 | MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region"); |
| 48 | - return index (s, c); |
| 49 | + return strchr (s, c); |
| 50 | } |
| 51 | |
| 52 | |
| 53 | @@ -462,7 +462,7 @@ WRAPPER2(char *, rindex, const char *s, int c) |
| 54 | size_t n = strlen (s); |
| 55 | TRACE ("%s\n", __PRETTY_FUNCTION__); |
| 56 | MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region"); |
| 57 | - return rindex (s, c); |
| 58 | + return strrchr (s, c); |
| 59 | } |
| 60 | |
| 61 | /* XXX: stpcpy, memccpy */ |
| 62 | -- |
| 63 | 1.7.10.4 |
| 64 | |