[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28667] trunk/blender/source/blender/ blenlib: revert own commit 28662.
Campbell Barton
ideasman42 at gmail.com
Sat May 8 17:37:30 CEST 2010
Revision: 28667
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28667
Author: campbellbarton
Date: 2010-05-08 17:37:29 +0200 (Sat, 08 May 2010)
Log Message:
-----------
revert own commit 28662.
strnlen is a GNU extension according to http://unixpapa.com/incnote/string.html
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 08:54:22 UTC (rev 28666)
+++ trunk/blender/source/blender/blenlib/BLI_string.h 2010-05-08 15:37:29 UTC (rev 28667)
@@ -128,6 +128,7 @@
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 08:54:22 UTC (rev 28666)
+++ trunk/blender/source/blender/blenlib/intern/BLI_dynstr.c 2010-05-08 15:37:29 UTC (rev 28667)
@@ -39,10 +39,7 @@
#ifndef vsnprintf
#define vsnprintf _vsnprintf
#endif
-#ifndef strnlen
-#define strnlen _strnlen
#endif
-#endif
/***/
@@ -86,7 +83,7 @@
void BLI_dynstr_nappend(DynStr *ds, const char *cstr, int len) {
DynStrElem *dse= malloc(sizeof(*dse));
- int cstrlen= strnlen(cstr, len);
+ int cstrlen= BLI_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 08:54:22 UTC (rev 28666)
+++ trunk/blender/source/blender/blenlib/intern/string.c 2010-05-08 15:37:29 UTC (rev 28667)
@@ -342,3 +342,9 @@
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;
+}
More information about the Bf-blender-cvs
mailing list