yann@27: Index: gcc-4.2/libmudflap/mf-hooks2.c yann@27: =================================================================== yann@27: --- gcc-4.2/libmudflap/mf-hooks2.c (revision 119834) yann@27: +++ gcc-4.2/libmudflap/mf-hooks2.c (working copy) yann@27: @@ -427,7 +427,7 @@ yann@27: { yann@27: TRACE ("%s\n", __PRETTY_FUNCTION__); yann@27: MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region"); yann@27: - bzero (s, n); yann@27: + memset (s, 0, n); yann@27: } yann@27: yann@27: yann@27: @@ -437,7 +437,7 @@ yann@27: TRACE ("%s\n", __PRETTY_FUNCTION__); yann@27: MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src"); yann@27: MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest"); yann@27: - bcopy (src, dest, n); yann@27: + memmove (dest, src, n); yann@27: } yann@27: yann@27: yann@27: @@ -447,7 +447,7 @@ yann@27: TRACE ("%s\n", __PRETTY_FUNCTION__); yann@27: MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg"); yann@27: MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg"); yann@27: - return bcmp (s1, s2, n); yann@27: + return n == 0 ? 0 : memcmp (s1, s2, n); yann@27: } yann@27: yann@27: yann@27: @@ -456,7 +456,7 @@ yann@27: size_t n = strlen (s); yann@27: TRACE ("%s\n", __PRETTY_FUNCTION__); yann@27: MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region"); yann@27: - return index (s, c); yann@27: + return strchr (s, c); yann@27: } yann@27: yann@27: yann@27: @@ -465,7 +465,7 @@ yann@27: size_t n = strlen (s); yann@27: TRACE ("%s\n", __PRETTY_FUNCTION__); yann@27: MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region"); yann@27: - return rindex (s, c); yann@27: + return strrchr (s, c); yann@27: } yann@27: yann@27: /* XXX: stpcpy, memccpy */