From 2e01ef5957bcdecb057d94122529b7cbd7f40ec2 Mon Sep 17 00:00:00 2001
From: Martin Pool <mbp@samba.org>
Date: Tue, 11 Mar 2003 07:25:48 +0000
Subject: Remove valgrind_strlen function, hopefully no longer needed with
 recent Valgrind relases and clashing with -DVALGRIND. (This used to be commit
 98479f1315cf8968152e1566966ac57e171008c3)

---
 source3/include/includes.h |  4 ----
 source3/lib/util_str.c     |  9 ---------
 source3/tdb/tdbbackup.c    | 10 ----------
 3 files changed, 23 deletions(-)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 7e5ad0e3cd..b6abdd99ce 100644
--- 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 924cf9d921..7dd5ee4242 100644
--- 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 7b344de6c4..36ba7db918 100644
--- 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
-- 
cgit