Opt: Added OPT_HELP_COLUMNS

[libucw.git] / ucw / string.c

diff --git a/ucw/string.c b/ucw/string.c
index d6dc7bd5188524f0698e9820217b100da19a7b1e..29cfa42b5e50699de6fd5f4e62645fbb380c8d15 100644 (file)
--- a/ucw/string.c
+++ b/ucw/string.c
@@ -10,14 +10,12 @@
 
 #undef LOCAL_DEBUG
 
-#include "ucw/lib.h"
-#include "ucw/string.h"
-
-#include <string.h>
+#include <ucw/lib.h>
+#include <ucw/string.h>
 
 #ifdef CONFIG_DARWIN
-uns
-strnlen(const char *str, uns n)
+size_t
+strnlen(const char *str, size_t n)
 {
   const char *end = str + n;
   const char *c;
@@ -27,10 +25,10 @@ strnlen(const char *str, uns n)
 #endif
 
 char *
-str_format_flags(char *dest, const char *fmt, uns flags)
+str_format_flags(char *dest, const char *fmt, uint flags)
 {
   char *start = dest;
-  for (uns i=0; fmt[i]; i++)
+  for (uint i=0; fmt[i]; i++)
     {
       if (flags & (1 << i))
        *dest++ = fmt[i];
@@ -41,33 +39,13 @@ str_format_flags(char *dest, const char *fmt, uns flags)
   return start;
 }
 
-uns
-str_count_char(const char *str, uns chr)
+size_t
+str_count_char(const char *str, uint chr)
 {
   const byte *s = str;
-  uns i = 0;
+  size_t i = 0;
   while (*s)
     if (*s++ == chr)
       i++;
   return i;
 }
-
-int
-str_starts_with(const char *haystack, const char *needle)
-{
-  while (*needle)
-    if (*haystack++ != *needle++)
-      return 0;
-  return 1;
-}
-
-int
-str_ends_with(const char *haystack, const char *needle)
-{
-  int hlen = strlen(haystack);
-  int nlen = strlen(needle);
-  if (hlen < nlen)
-    return 0;
-  else
-    return !memcmp(haystack + hlen - nlen, needle, nlen);
-}