| author | Arnaud Lacombe <lacombar@gmail.com> |
| Thu Aug 05 17:59:51 2010 +0200 (2010-08-05) | |
| changeset 2069 | 366bd2b22675 |
| parent 111 | 2e16b9fc302d |
| permissions | -rw-r--r-- |
| yann@111 | 1 |
Index: gcc-4.2/libmudflap/mf-hooks2.c |
| yann@111 | 2 |
=================================================================== |
| yann@111 | 3 |
--- gcc-4.2/libmudflap/mf-hooks2.c (revision 119834) |
| yann@111 | 4 |
+++ gcc-4.2/libmudflap/mf-hooks2.c (working copy) |
| yann@111 | 5 |
@@ -427,7 +427,7 @@ |
| yann@111 | 6 |
{
|
| yann@111 | 7 |
TRACE ("%s\n", __PRETTY_FUNCTION__);
|
| yann@111 | 8 |
MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region"); |
| yann@111 | 9 |
- bzero (s, n); |
| yann@111 | 10 |
+ memset (s, 0, n); |
| yann@111 | 11 |
} |
| yann@111 | 12 |
|
| yann@111 | 13 |
|
| yann@111 | 14 |
@@ -437,7 +437,7 @@ |
| yann@111 | 15 |
TRACE ("%s\n", __PRETTY_FUNCTION__);
|
| yann@111 | 16 |
MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src"); |
| yann@111 | 17 |
MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest"); |
| yann@111 | 18 |
- bcopy (src, dest, n); |
| yann@111 | 19 |
+ memmove (dest, src, n); |
| yann@111 | 20 |
} |
| yann@111 | 21 |
|
| yann@111 | 22 |
|
| yann@111 | 23 |
@@ -447,7 +447,7 @@ |
| yann@111 | 24 |
TRACE ("%s\n", __PRETTY_FUNCTION__);
|
| yann@111 | 25 |
MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg"); |
| yann@111 | 26 |
MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg"); |
| yann@111 | 27 |
- return bcmp (s1, s2, n); |
| yann@111 | 28 |
+ return n == 0 ? 0 : memcmp (s1, s2, n); |
| yann@111 | 29 |
} |
| yann@111 | 30 |
|
| yann@111 | 31 |
|
| yann@111 | 32 |
@@ -456,7 +456,7 @@ |
| yann@111 | 33 |
size_t n = strlen (s); |
| yann@111 | 34 |
TRACE ("%s\n", __PRETTY_FUNCTION__);
|
| yann@111 | 35 |
MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region"); |
| yann@111 | 36 |
- return index (s, c); |
| yann@111 | 37 |
+ return strchr (s, c); |
| yann@111 | 38 |
} |
| yann@111 | 39 |
|
| yann@111 | 40 |
|
| yann@111 | 41 |
@@ -465,7 +465,7 @@ |
| yann@111 | 42 |
size_t n = strlen (s); |
| yann@111 | 43 |
TRACE ("%s\n", __PRETTY_FUNCTION__);
|
| yann@111 | 44 |
MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region"); |
| yann@111 | 45 |
- return rindex (s, c); |
| yann@111 | 46 |
+ return strrchr (s, c); |
| yann@111 | 47 |
} |
| yann@111 | 48 |
|
| yann@111 | 49 |
/* XXX: stpcpy, memccpy */ |