Remove valgrind_strlen function, hopefully no longer needed with

recent Valgrind relases and clashing with -DVALGRIND.
(This used to be commit 98479f1315cf8968152e1566966ac57e171008c3)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 7e5ad0e3cdc0599d86f78381dae9d306f11e1a2e..b6abdd99ce74236fbe6675a92a91e4e7258a907f 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1220,10 +1220,6 @@ int smb_xvasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE(
 time_t timegm(struct tm *tm);
 #endif
 
-#if defined(VALGRIND)
-#define strlen(x) valgrind_strlen(x)
-#endif
-
 /*
  * Veritas File System.  Often in addition to native.
  * Quotas different.

diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 924cf9d921465ca4c303c74fee03cc1755c02fa4..7dd5ee42423706ae93c4027d8e54c92ca85c7fe8 100644 (file)
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -1667,12 +1667,3 @@ char * base64_encode_data_blob(DATA_BLOB data)
     return result;
 }
 
-#ifdef VALGRIND
-size_t valgrind_strlen(const char *s)
-{
-       size_t count;
-       for(count = 0; *s++; count++)
-               ;
-       return count;
-}
-#endif

diff --git a/source3/tdb/tdbbackup.c b/source3/tdb/tdbbackup.c
index 7b344de6c45e716576fa4dc31254a18bc75e2ea4..36ba7db918824e31784f834bfec0e55e0bd0d4af 100644 (file)
--- a/source3/tdb/tdbbackup.c
+++ b/source3/tdb/tdbbackup.c
@@ -303,13 +303,3 @@ static void usage(void)
 
        return ret;
 }
-
-#ifdef VALGRIND
-size_t valgrind_strlen(const char *s)
-{
-       size_t count;
-       for(count = 0; *s++; count++)
-               ;
-       return count;
-}
-#endif