From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 14 Mar 2005 18:08:04 +0000 (+0000)
Subject: memcmp replacement fixes
X-Git-Tag: OPENLDAP_REL_ENG_2_2_24~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d68ec7b661c022c783813c66e0e6bc4ad6ff94a5;p=thirdparty%2Fopenldap.git

memcmp replacement fixes
---

diff --git a/include/ac/string.h b/include/ac/string.h
index 239a421a0e..3d5725fd5e 100644
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -89,6 +89,11 @@ int (strncasecmp)();
 		else AC_MEMCPY( (d), (s), (n) ); \
 	} while(0)
 
+#ifdef NEED_MEMCMP_REPLACEMENT
+	int (lutil_memcmp)(const void *b1, const void *b2, size_t len);
+#define memcmp lutil_memcmp
+#endif
+
 #define STRLENOF(s)	(sizeof(s)-1)
 
 #endif /* _AC_STRING_H */
diff --git a/libraries/liblutil/memcmp.c b/libraries/liblutil/memcmp.c
index 2dcd8c1b03..c4d2537ef8 100644
--- a/libraries/liblutil/memcmp.c
+++ b/libraries/liblutil/memcmp.c
@@ -21,14 +21,13 @@
  * Memory Compare
  */
 int
-(memcmp)(const void *v1, const void *v2, int n) 
+(lutil_memcmp)(const void *v1, const void *v2, size_t n) 
 {
     if (n != 0) {
 		const unsigned char *s1=v1, *s2=v2;
         do {
-            if (*s1++ != *s2++)
-                return (*--s1 - *--s2);
+            if (*s1++ != *s2++) return *--s1 - *--s2;
         } while (--n != 0);
     }
-    return (0);
+    return 0;
 }