[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51670] trunk/blender/source/blender: change BLI_strlen_range_utf8 to the more conventional BLI_strnlen_utf8

[Campbell Barton]

Revision: 51670
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51670
Author:   campbellbarton
Date:     2012-10-27 02:47:39 +0000 (Sat, 27 Oct 2012)
Log Message:
-----------
change BLI_strlen_range_utf8 to the more conventional BLI_strnlen_utf8

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_string.h
    trunk/blender/source/blender/blenlib/BLI_string_utf8.h
    trunk/blender/source/blender/blenlib/intern/string.c
    trunk/blender/source/blender/blenlib/intern/string_utf8.c
    trunk/blender/source/blender/editors/interface/interface_handlers.c

Modified: trunk/blender/source/blender/blenlib/BLI_string.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_string.h	2012-10-27 01:46:47 UTC (rev 51669)
+++ trunk/blender/source/blender/blenlib/BLI_string.h	2012-10-27 02:47:39 UTC (rev 51670)
@@ -204,7 +204,7 @@
 __attribute__((nonnull))
 #endif
 ;
-size_t BLI_strnlen(const char *str, size_t maxlen)
+size_t BLI_strnlen(const char *str, const size_t maxlen)
 #ifdef __GNUC__
 __attribute__((warn_unused_result))
 __attribute__((nonnull))

Modified: trunk/blender/source/blender/blenlib/BLI_string_utf8.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_string_utf8.h	2012-10-27 01:46:47 UTC (rev 51669)
+++ trunk/blender/source/blender/blenlib/BLI_string_utf8.h	2012-10-27 02:47:39 UTC (rev 51670)
@@ -50,7 +50,7 @@
 /* wchar_t functions, copied from blenders own font.c originally */
 size_t       BLI_wstrlen_utf8(const wchar_t *src);
 size_t       BLI_strlen_utf8(const char *strc);
-size_t       BLI_strlen_range_utf8(const char *start, const char *end);
+size_t       BLI_strnlen_utf8(const char *start, const size_t maxlen);
 size_t       BLI_strncpy_wchar_as_utf8(char *__restrict dst, const wchar_t *__restrict src, const size_t maxcpy);
 size_t       BLI_strncpy_wchar_from_utf8(wchar_t *__restrict dst, const char *__restrict src, const size_t maxcpy);
 

Modified: trunk/blender/source/blender/blenlib/intern/string.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/string.c	2012-10-27 01:46:47 UTC (rev 51669)
+++ trunk/blender/source/blender/blenlib/intern/string.c	2012-10-27 02:47:39 UTC (rev 51670)
@@ -416,7 +416,7 @@
 }
 
 /* determine the length of a fixed-size string */
-size_t BLI_strnlen(const char *str, size_t maxlen)
+size_t BLI_strnlen(const char *str, const size_t maxlen)
 {
 	const char *end = memchr(str, '\0', maxlen);
 	return end ? (size_t) (end - str) : maxlen;

Modified: trunk/blender/source/blender/blenlib/intern/string_utf8.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/string_utf8.c	2012-10-27 01:46:47 UTC (rev 51669)
+++ trunk/blender/source/blender/blenlib/intern/string_utf8.c	2012-10-27 02:47:39 UTC (rev 51670)
@@ -261,13 +261,21 @@
 	return len;
 }
 
-size_t BLI_strlen_range_utf8(const char *start, const char *end)
+/**
+ * \param start the string to measure the length.
+ * \param maxlen the string length (in bytes)
+ * \return the unicode length (not in bytes!)
+ */
+size_t BLI_strnlen_utf8(const char *start, const size_t maxlen)
 {
 	const char *strc = start;
-	int len;
+	const char *strc_end = start + maxlen;
 
-	for (len = 0; strc < end; len++)
+	size_t len;
+
+	for (len = 0; *strc && strc < strc_end; len++) {
 		strc += strlen_utf8_char(strc);
+	}
 
 	return len;
 }

Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c	2012-10-27 01:46:47 UTC (rev 51669)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2012-10-27 02:47:39 UTC (rev 51670)
@@ -1324,7 +1324,7 @@
 
 static int ui_text_position_to_hidden(uiBut *but, int pos)
 {
-	return BLI_strlen_range_utf8(but->drawstr, but->drawstr + pos);
+	return BLI_strnlen_utf8(but->drawstr, pos);
 }
 
 void ui_button_text_password_hide(char password_str[UI_MAX_DRAW_STR], uiBut *but, int restore)