| author | "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> |
| Fri Oct 08 23:37:12 2010 +0200 (2010-10-08) | |
| branch | 1.8 |
| changeset 2150 | f97a8ad2b172 |
| parent 687 | b2b6b1d46aa1 |
| permissions | -rw-r--r-- |
| yann@687 | 1 |
diff -durN gcc-4.2.1.orig/libmudflap/mf-hooks2.c gcc-4.2.1/libmudflap/mf-hooks2.c |
| yann@687 | 2 |
--- gcc-4.2.1.orig/libmudflap/mf-hooks2.c 2005-09-23 23:58:39.000000000 +0200 |
| yann@687 | 3 |
+++ gcc-4.2.1/libmudflap/mf-hooks2.c 2007-08-03 20:35:09.000000000 +0200 |
| yann@687 | 4 |
@@ -427,7 +427,7 @@ |
| yann@687 | 5 |
{
|
| yann@687 | 6 |
TRACE ("%s\n", __PRETTY_FUNCTION__);
|
| yann@687 | 7 |
MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region"); |
| yann@687 | 8 |
- bzero (s, n); |
| yann@687 | 9 |
+ memset (s, 0, n); |
| yann@687 | 10 |
} |
| yann@687 | 11 |
|
| yann@687 | 12 |
|
| yann@687 | 13 |
@@ -437,7 +437,7 @@ |
| yann@687 | 14 |
TRACE ("%s\n", __PRETTY_FUNCTION__);
|
| yann@687 | 15 |
MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src"); |
| yann@687 | 16 |
MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest"); |
| yann@687 | 17 |
- bcopy (src, dest, n); |
| yann@687 | 18 |
+ memmove (dest, src, n); |
| yann@687 | 19 |
} |
| yann@687 | 20 |
|
| yann@687 | 21 |
|
| yann@687 | 22 |
@@ -447,7 +447,7 @@ |
| yann@687 | 23 |
TRACE ("%s\n", __PRETTY_FUNCTION__);
|
| yann@687 | 24 |
MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg"); |
| yann@687 | 25 |
MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg"); |
| yann@687 | 26 |
- return bcmp (s1, s2, n); |
| yann@687 | 27 |
+ return n == 0 ? 0 : memcmp (s1, s2, n); |
| yann@687 | 28 |
} |
| yann@687 | 29 |
|
| yann@687 | 30 |
|
| yann@687 | 31 |
@@ -456,7 +456,7 @@ |
| yann@687 | 32 |
size_t n = strlen (s); |
| yann@687 | 33 |
TRACE ("%s\n", __PRETTY_FUNCTION__);
|
| yann@687 | 34 |
MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region"); |
| yann@687 | 35 |
- return index (s, c); |
| yann@687 | 36 |
+ return strchr (s, c); |
| yann@687 | 37 |
} |
| yann@687 | 38 |
|
| yann@687 | 39 |
|
| yann@687 | 40 |
@@ -465,7 +465,7 @@ |
| yann@687 | 41 |
size_t n = strlen (s); |
| yann@687 | 42 |
TRACE ("%s\n", __PRETTY_FUNCTION__);
|
| yann@687 | 43 |
MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region"); |
| yann@687 | 44 |
- return rindex (s, c); |
| yann@687 | 45 |
+ return strrchr (s, c); |
| yann@687 | 46 |
} |
| yann@687 | 47 |
|
| yann@687 | 48 |
/* XXX: stpcpy, memccpy */ |