[Bf-blender-cvs] [2666a222f6] master: Cleanup/fix last remnant usages of int instead of size_t for string length in BLI_string_utils.

Bastien Montagne noreply at git.blender.org
Fri Jan 20 16:51:21 CET 2017


Commit: 2666a222f62ea7b33aa1a72ea0ca504ca10383de
Author: Bastien Montagne
Date:   Fri Jan 20 12:21:04 2017 +0100
Branches: master
https://developer.blender.org/rB2666a222f62ea7b33aa1a72ea0ca504ca10383de

Cleanup/fix last remnant usages of int instead of size_t for string length in BLI_string_utils.

===================================================================

M	source/blender/blenlib/BLI_string_utils.h
M	source/blender/blenlib/intern/string_utils.c

===================================================================

diff --git a/source/blender/blenlib/BLI_string_utils.h b/source/blender/blenlib/BLI_string_utils.h
index 719d6e3c57..bb19ed574b 100644
--- a/source/blender/blenlib/BLI_string_utils.h
+++ b/source/blender/blenlib/BLI_string_utils.h
@@ -44,7 +44,7 @@ struct ListBase;
 
 typedef bool (*UniquenameCheckCallback)(void *arg, const char *name);
 
-int BLI_split_name_num(char *left, int *nr, const char *name, const char delim);
+size_t BLI_split_name_num(char *left, int *nr, const char *name, const char delim);
 
 void BLI_string_split_suffix(const char *string, char *r_body, char *r_suf, const size_t str_len);
 void BLI_string_split_prefix(const char *string, char *r_pre, char *r_body, const size_t str_len);
diff --git a/source/blender/blenlib/intern/string_utils.c b/source/blender/blenlib/intern/string_utils.c
index 435a88d6e2..8d91a55a5a 100644
--- a/source/blender/blenlib/intern/string_utils.c
+++ b/source/blender/blenlib/intern/string_utils.c
@@ -61,7 +61,7 @@
  * \param delim  Delimiter character
  * \return  Length of \a left
  */
-int BLI_split_name_num(char *left, int *nr, const char *name, const char delim)
+size_t BLI_split_name_num(char *left, int *nr, const char *name, const char delim)
 {
 	const size_t name_len = strlen(name);
 
@@ -70,7 +70,7 @@ int BLI_split_name_num(char *left, int *nr, const char *name, const char delim)
 
 	/* name doesn't end with a delimiter "foo." */
 	if ((name_len > 1 && name[name_len - 1] == delim) == 0) {
-		int a = name_len;
+		size_t a = name_len;
 		while (a--) {
 			if (name[a] == delim) {
 				left[a] = '\0';  /* truncate left part here */
@@ -295,7 +295,7 @@ bool BLI_uniquename_cb(
 		char *tempname = alloca(name_len);
 		char *left = alloca(name_len);
 		int number;
-		int len = BLI_split_name_num(left, &number, name, delim);
+		size_t len = BLI_split_name_num(left, &number, name, delim);
 		do {
 			/* add 1 to account for \0 */
 			const size_t numlen = BLI_snprintf(numstr, sizeof(numstr), "%c%03d", delim, ++number) + 1;




More information about the Bf-blender-cvs mailing list