[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28662] trunk/blender/source/blender/ blenlib: remove BLI_strnlen, use _strnlen as strnlen on windows.

[Campbell Barton]

Revision: 28662
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28662
Author:   campbellbarton
Date:     2010-05-08 09:34:01 +0200 (Sat, 08 May 2010)

Log Message:
-----------
remove BLI_strnlen, use _strnlen as strnlen on windows.
cant test on windows but from what I can tell this exists like _vsnprintf

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_string.h
    trunk/blender/source/blender/blenlib/intern/BLI_dynstr.c
    trunk/blender/source/blender/blenlib/intern/string.c

Modified: trunk/blender/source/blender/blenlib/BLI_string.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_string.h	2010-05-08 07:25:26 UTC (rev 28661)
+++ trunk/blender/source/blender/blenlib/BLI_string.h	2010-05-08 07:34:01 UTC (rev 28662)
@@ -128,7 +128,6 @@
 int BLI_strcasecmp(const char *s1, const char *s2);
 int BLI_strncasecmp(const char *s1, const char *s2, int n);
 int BLI_natstrcmp(const char *s1, const char *s2);
-size_t BLI_strnlen(const char *str, size_t maxlen);
 
 void BLI_timestr(double _time, char *str); /* time var is global */
 

Modified: trunk/blender/source/blender/blenlib/intern/BLI_dynstr.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_dynstr.c	2010-05-08 07:25:26 UTC (rev 28661)
+++ trunk/blender/source/blender/blenlib/intern/BLI_dynstr.c	2010-05-08 07:34:01 UTC (rev 28662)
@@ -39,7 +39,10 @@
 #ifndef vsnprintf
 #define vsnprintf _vsnprintf
 #endif
+#ifndef strnlen
+#define strnlen _strnlen
 #endif
+#endif
 
 /***/
 
@@ -83,7 +86,7 @@
 
 void BLI_dynstr_nappend(DynStr *ds, const char *cstr, int len) {
 	DynStrElem *dse= malloc(sizeof(*dse));
-	int cstrlen= BLI_strnlen(cstr, len);
+	int cstrlen= strnlen(cstr, len);
 
 	dse->str= malloc(cstrlen+1);
 	memcpy(dse->str, cstr, cstrlen);

Modified: trunk/blender/source/blender/blenlib/intern/string.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/string.c	2010-05-08 07:25:26 UTC (rev 28661)
+++ trunk/blender/source/blender/blenlib/intern/string.c	2010-05-08 07:34:01 UTC (rev 28662)
@@ -342,9 +342,3 @@
 	str[11]=0;
 }
 
-/* determine the length of a fixed-size string */
-size_t BLI_strnlen(const char *str, size_t maxlen)
-{
-	const char *end = memchr(str, '\0', maxlen);
-	return end ? (size_t) (end - str) : maxlen;
-}