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 a2c50fd38f7540533095ddcd2798b03cd96039b6..388d7887ef6d1ca41747bc74d68f838272fce939 100644 (file)
--- a/lib/util/util_str.c
+++ b/lib/util/util_str.c
@@ -31,98 +31,6 @@
  * @brief String utilities.
  **/
 
-/**
- Safe string copy into a known length string. maxlength does not
- include the terminating zero.
-**/
-_PUBLIC_ char *safe_strcpy(char *dest,const char *src, size_t maxlength)
-{
-       size_t len;
-
-       if (!dest) {
-               DEBUG(0,("ERROR: NULL dest in safe_strcpy\n"));
-               return NULL;
-       }
-
-#ifdef DEVELOPER
-       /* We intentionally write out at the extremity of the destination
-        * string.  If the destination is too short (e.g. pstrcpy into mallocd
-        * or fstring) then this should cause an error under a memory
-        * checker. */
-       dest[maxlength] = '\0';
-       if (PTR_DIFF(&len, dest) > 0) {  /* check if destination is on the stack, ok if so */
-               log_suspicious_usage("safe_strcpy", src);
-       }
-#endif
-
-       if (!src) {
-               *dest = 0;
-               return dest;
-       }  
-
-       len = strlen(src);
-
-       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));
-               len = maxlength;
-       }
-      
-       memmove(dest, src, len);
-       dest[len] = 0;
-       return dest;
-}  
-
-/**
- Safe string cat into a string. maxlength does not
- include the terminating zero.
-**/
-_PUBLIC_ char *safe_strcat(char *dest, const char *src, size_t maxlength)
-{
-       size_t src_len, dest_len;
-
-       if (!dest) {
-               DEBUG(0,("ERROR: NULL dest in safe_strcat\n"));
-               return NULL;
-       }
-
-       if (!src)
-               return dest;
-       
-#ifdef DEVELOPER
-       if (PTR_DIFF(&src_len, dest) > 0) {  /* check if destination is on the stack, ok if so */
-               log_suspicious_usage("safe_strcat", src);
-       }
-#endif
-       src_len = strlen(src);
-       dest_len = strlen(dest);
-
-       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;
-}
-
-#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
@@ -158,30 +66,6 @@ _PUBLIC_ const char *str_format_nbt_domain(TALLOC_CTX *mem_ctx, const char *s)
        return ret;
 }
 
-/**
- * Add a string to an array of strings.
- *
- * num should be a pointer to an integer that holds the current 
- * number of elements in strings. It will be updated by this function.
- */
-_PUBLIC_ bool add_string_to_array(TALLOC_CTX *mem_ctx,
-                        const char *str, const char ***strings, int *num)
-{
-       char *dup_str = talloc_strdup(mem_ctx, str);
-
-       *strings = talloc_realloc(mem_ctx,
-                                   *strings,
-                                   const char *, ((*num)+1));
-
-       if ((*strings == NULL) || (dup_str == NULL))
-               return false;
-
-       (*strings)[*num] = dup_str;
-       *num += 1;
-
-       return true;
-}
-
 /**
  * Parse a string containing a boolean value.
  *
@@ -210,7 +94,7 @@ _PUBLIC_ bool conv_str_bool(const char * str, bool * val)
 /**
  * Convert a size specification like 16K into an integral number of bytes. 
  **/
-_PUBLIC_ bool conv_str_size(const char * str, uint64_t * val)
+_PUBLIC_ bool conv_str_size_error(const char * str, uint64_t * val)
 {
        char *              end = NULL;
        unsigned long long  lval;
@@ -269,36 +153,6 @@ _PUBLIC_ bool conv_str_u64(const char * str, uint64_t * val)
        return true;
 }
 
-/**
-Do a case-insensitive, whitespace-ignoring string compare.
-**/
-_PUBLIC_ int strwicmp(const char *psz1, const char *psz2)
-{
-       /* if BOTH strings are NULL, return TRUE, if ONE is NULL return */
-       /* appropriate value. */
-       if (psz1 == psz2)
-               return (0);
-       else if (psz1 == NULL)
-               return (-1);
-       else if (psz2 == NULL)
-               return (1);
-
-       /* sync the strings on first non-whitespace */
-       while (1) {
-               while (isspace((int)*psz1))
-                       psz1++;
-               while (isspace((int)*psz2))
-                       psz2++;
-               if (toupper((unsigned char)*psz1) != toupper((unsigned char)*psz2) 
-                   || *psz1 == '\0'
-                   || *psz2 == '\0')
-                       break;
-               psz1++;
-               psz2++;
-       }
-       return (*psz1 - *psz2);
-}
-
 /**
  * Compare 2 strings.
  *
@@ -311,25 +165,6 @@ _PUBLIC_ bool strequal(const char *s1, const char *s2)
        if (!s1 || !s2)
                return false;
   
-       return strcasecmp(s1,s2) == 0;
-}
-
-_PUBLIC_ size_t ucs2_align(const void *base_ptr, const void *p, int flags)
-{
-       if (flags & (STR_NOALIGN|STR_ASCII))
-               return 0;
-       return PTR_DIFF(p, base_ptr) & 1;
+       return strcasecmp_m(s1,s2) == 0;
 }
 
-/**
- String replace.
-**/
-_PUBLIC_ void string_replace(char *s, char oldc, char newc)
-{
-       while (*s) {
-               if (*s == oldc) *s = newc;
-               s++;
-       }
-}
-
-