From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Wed, 25 Aug 2004 13:33:17 +0000 (+0000)
Subject: Remove three unnecessary compile-time warnings.
X-Git-Tag: svn/VALGRIND_2_2_0~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29d59df719aa2b396161aad342446689041c317f;p=thirdparty%2Fvalgrind.git

Remove three unnecessary compile-time warnings.

Two were trivial.  The one for strncmp is slightly trickier;  you have to be
careful with the signedness of chars when comparing them... but the code
already casts s1 and s2 to (unsigned char*) before comparing them, so it's not
a problem.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2618
---

diff --git a/memcheck/mac_replace_strmem.c b/memcheck/mac_replace_strmem.c
index 037b989ff0..5e8ecd3347 100644
--- a/memcheck/mac_replace_strmem.c
+++ b/memcheck/mac_replace_strmem.c
@@ -155,11 +155,11 @@ char* strcat ( char* dst, const char* src )
    return dst_orig;
 }
 
-char* strncat ( char* dst, const char* src, int n )
+char* strncat ( char* dst, const char* src, unsigned int n )
 {
    const Char* src_orig = src;
          Char* dst_orig = dst;
-   Int   m = 0;
+   UInt  m = 0;
 
    while (*dst) dst++;
    while (m   < n && *src) { m++; *dst++ = *src++; } /* concat <= n chars */
@@ -209,11 +209,11 @@ char* strcpy ( char* dst, const char* src )
    return dst_orig;
 }
 
-char* strncpy ( char* dst, const char* src, int n )
+char* strncpy ( char* dst, const char* src, unsigned int n )
 {
    const Char* src_orig = src;
          Char* dst_orig = dst;
-   Int   m = 0;
+   UInt  m = 0;
 
    while (m   < n && *src) { m++; *dst++ = *src++; }
    /* Check for overlap after copying; all n bytes of dst are relevant,
@@ -225,8 +225,7 @@ char* strncpy ( char* dst, const char* src, int n )
    return dst_orig;
 }
 
-int strncmp ( const unsigned char* s1, const unsigned char* s2, 
-              unsigned int nmax )
+int strncmp ( const char* s1, const char* s2, unsigned int nmax )
 {
    unsigned int n = 0;
    while (True) {