From 2666a222f62ea7b33aa1a72ea0ca504ca10383de Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 20 Jan 2017 12:21:04 +0100 Subject: [PATCH] Cleanup/fix last remnant usages of int instead of size_t for string length in BLI_string_utils. --- source/blender/blenlib/BLI_string_utils.h | 2 +- source/blender/blenlib/intern/string_utils.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/blender/blenlib/BLI_string_utils.h b/source/blender/blenlib/BLI_string_utils.h index 719d6e3c57b..bb19ed574bb 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 435a88d6e21..8d91a55a5ad 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;