Changeset 745 for trunk/server/lib/util/util_str.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• lib/util/util_str.c (modified) (2 diffs)

trunk/server/lib/util/util_str.c

@@ -65 +65 @@
         if (len > maxlength) {
                 DEBUG(0,("ERROR: string overflow by %u (%u - %u) in safe_strcpy [%.50s]\n",
-                         (uint_t)(len-maxlength), (unsigned)len, (unsigned)maxlength, src));
+                         (unsigned int)(len-maxlength), (unsigned)len, (unsigned)maxlength, src));
                 len = maxlength;
         }
@@ -112 +112 @@
         return dest;
 }
-
-#ifdef VALGRIND
-size_t valgrind_strlen(const char *s)
-{
-        size_t count;
-        for(count = 0; *s++; count++)
-                ;
-        return count;
-}
-#endif
-
 
 /**