lib/util/attr: add _UNUSED_ marco

[ira/wip.git] / lib / util / util_str.c

diff --git a/lib/util/util_str.c b/lib/util/util_str.c
index 34dd5be56ebca6cf588307c9b7af133a318dc81c..388d7887ef6d1ca41747bc74d68f838272fce939 100644 (file)
--- a/lib/util/util_str.c
+++ b/lib/util/util_str.c
@@ -31,77 +31,6 @@
  * @brief String utilities.
  **/
 
-/**
- Safe string copy into a known length string. maxlength does not
- include the terminating zero.
-**/
-
-_PUBLIC_ char *safe_strcpy_fn(char *dest,
-                             const char *src,
-                             size_t maxlength)
-{
-       size_t len;
-
-       if (!dest) {
-               smb_panic("ERROR: NULL dest in safe_strcpy");
-       }
-
-       if (!src) {
-               *dest = 0;
-               return dest;
-       }
-
-       len = strnlen(src, maxlength+1);
-
-       if (len > maxlength) {
-               DEBUG(0,("ERROR: string overflow by "
-                       "%lu (%lu - %lu) in safe_strcpy [%.50s]\n",
-                        (unsigned long)(len-maxlength), (unsigned long)len,
-                        (unsigned long)maxlength, src));
-               len = maxlength;
-       }
-
-       memmove(dest, src, len);
-       dest[len] = 0;
-       return dest;
-}
-
-/**
- Safe string cat into a string. maxlength does not
- include the terminating zero.
-**/
-char *safe_strcat_fn(char *dest,
-                    const char *src,
-                    size_t maxlength)
-{
-       size_t src_len, dest_len;
-
-       if (!dest) {
-               smb_panic("ERROR: NULL dest in safe_strcat");
-       }
-
-       if (!src)
-               return dest;
-
-       src_len = strnlen(src, maxlength + 1);
-       dest_len = strnlen(dest, maxlength + 1);
-
-       if (src_len + dest_len > maxlength) {
-               DEBUG(0,("ERROR: string overflow by %d "
-                       "in safe_strcat [%.50s]\n",
-                        (int)(src_len + dest_len - maxlength), src));
-               if (maxlength > dest_len) {
-                       memcpy(&dest[dest_len], src, maxlength - dest_len);
-               }
-               dest[maxlength] = 0;
-               return NULL;
-       }
-
-       memcpy(&dest[dest_len], src, src_len);
-       dest[dest_len + src_len] = 0;
-       return dest;
-}
-
 /**
   format a string into length-prefixed dotted domain format, as used in NBT
   and in some ADS structures
@@ -236,6 +165,6 @@ _PUBLIC_ bool strequal(const char *s1, const char *s2)
        if (!s1 || !s2)
                return false;
   
-       return strcasecmp(s1,s2) == 0;
+       return strcasecmp_m(s1,s2) == 0;
 }