[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55272] trunk/blender/source/blender/ blenlib/intern/string.c: minor change to BLI_strncpy().

[Campbell Barton]

Revision: 55272
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55272
Author:   campbellbarton
Date:     2013-03-14 09:49:20 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
minor change to BLI_strncpy(). replace strlen() with BLI_strnlen().

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

Modified: trunk/blender/source/blender/blenlib/intern/string.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/string.c	2013-03-14 07:56:40 UTC (rev 55271)
+++ trunk/blender/source/blender/blenlib/intern/string.c	2013-03-14 09:49:20 UTC (rev 55272)
@@ -71,13 +71,11 @@
 
 char *BLI_strncpy(char *__restrict dst, const char *__restrict src, const size_t maxncpy)
 {
-	size_t srclen = strlen(src);
-	size_t cpylen = (srclen > (maxncpy - 1)) ? (maxncpy - 1) : srclen;
+	size_t srclen = BLI_strnlen(src, maxncpy - 1);
 	BLI_assert(maxncpy != 0);
-	
-	memcpy(dst, src, cpylen);
-	dst[cpylen] = '\0';
-	
+
+	memcpy(dst, src, srclen);
+	dst[srclen] = '\0';
 	return dst;
 }