diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-18 10:44:46 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-18 15:09:47 +1100 |
| commit | 40a48f5502e216af2e7e6788694ad4e094f59d83 (patch) | |
| tree | 2c4c3d2c0650c1d8ea16b6422892f70de2205a0c | |
| parent | 324270ee572c86d48ff1ee84cc16924ef18ee2b9 (diff) | |
| download | samba-40a48f5502e216af2e7e6788694ad4e094f59d83.tar.gz samba-40a48f5502e216af2e7e6788694ad4e094f59d83.tar.bz2 samba-40a48f5502e216af2e7e6788694ad4e094f59d83.zip | |
s4-util: removed the valgrind_strlen() routine
this was for a bug in valgrind from 7 years ago.
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | lib/util/util.h | 7 | ||||
| -rw-r--r-- | lib/util/util_str.c | 11 |
2 files changed, 0 insertions, 18 deletions
diff --git a/lib/util/util.h b/lib/util/util.h index 8f4fd8f70b..dc8a93077e 100644 --- a/lib/util/util.h +++ b/lib/util/util.h @@ -59,13 +59,6 @@ extern const char *panic_action; __FILE__, __LINE__, #b)); }} while (0) #endif -#if _SAMBA_BUILD_ == 4 -#ifdef VALGRIND -#define strlen(x) valgrind_strlen(x) -size_t valgrind_strlen(const char *s); -#endif -#endif - #ifndef ABS #define ABS(a) ((a)>0?(a):(-(a))) #endif diff --git a/lib/util/util_str.c b/lib/util/util_str.c index 0ea71a8e3c..8695266655 100644 --- a/lib/util/util_str.c +++ b/lib/util/util_str.c @@ -112,17 +112,6 @@ _PUBLIC_ char *safe_strcat(char *dest, const char *src, size_t maxlength) return dest; } -#ifdef VALGRIND -size_t valgrind_strlen(const char *s) -{ - size_t count; - for(count = 0; *s++; count++) - ; - return count; -} -#endif - - /** format a string into length-prefixed dotted domain format, as used in NBT and in some ADS structures |