move strnlen() to ucw/string.c

diff --git a/ucw/stkstring.c b/ucw/stkstring.c
index e501ba20fabe4d47f04e892d47a2d7b4c45e0214..32bd974336c36e4781612f776b1657eb42e9f58f 100644 (file)
--- a/ucw/stkstring.c
+++ b/ucw/stkstring.c
@@ -15,17 +15,6 @@
 
 #include <stdio.h>
 
-#ifdef CONFIG_DARWIN
-uns
-strnlen(const char *str, uns n)
-{
-  const char *end = str + n;
-  const char *c;
-  for (c = str; *c && c < end; c++);
-  return c - str;
-}
-#endif
-
 uns
 stk_array_len(char **s, uns cnt)
 {

diff --git a/ucw/stkstring.h b/ucw/stkstring.h
index d96b72386adc703040e8db3e0e73b7f1b3882f46..5cd2c6b85a2540f4ca13c9879f8b4c3abda6a3b3 100644 (file)
--- a/ucw/stkstring.h
+++ b/ucw/stkstring.h
@@ -15,10 +15,7 @@
 #include <alloca.h>
 #include <string.h>
 #include <stdio.h>
-
-#ifdef CONFIG_DARWIN
-uns strnlen(const char *str, uns n);
-#endif
+#include "ucw/string.h"
 
 #define stk_strdup(s) ({ const char *_s=(s); uns _l=strlen(_s)+1; char *_x=alloca(_l); memcpy(_x, _s, _l); _x; })
 #define stk_strndup(s,n) ({ const char *_s=(s); uns _l=strnlen(_s,(n)); char *_x=alloca(_l+1); memcpy(_x, _s, _l); _x[_l]=0; _x; })

diff --git a/ucw/string.c b/ucw/string.c
index 195976978a4e369e78ee00263961af141d4c0ee5..bd9303ee8142a92b548e18580830705d3a1e3eab 100644 (file)
--- a/ucw/string.c
+++ b/ucw/string.c
@@ -13,6 +13,17 @@
 #include "ucw/lib.h"
 #include "ucw/string.h"
 
+#ifdef CONFIG_DARWIN
+uns
+strnlen(const char *str, uns n)
+{
+  const char *end = str + n;
+  const char *c;
+  for (c = str; *c && c < end; c++);
+  return c - str;
+}
+#endif
+
 char *
 str_format_flags(char *dest, const char *fmt, uns flags)
 {

diff --git a/ucw/string.h b/ucw/string.h
index f96bd0234012189ecabf268c5d5d5d533273360d..935da33b7c3f2f5f21f3bcfa0f0237608d321573 100644 (file)
--- a/ucw/string.h
+++ b/ucw/string.h
@@ -13,6 +13,10 @@
 
 /* string.c */
 
+#ifdef CONFIG_DARWIN
+uns strnlen(const char *str, uns n);
+#endif
+
 char *str_format_flags(char *dest, const char *fmt, uns flags);
 uns str_count_char(const char *str, uns chr);