kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Bastien Montagne 2017-01-20 12:21:04 +01:00
parent 404e59c842
commit 2666a222f6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenlib/BLI_string_utils.h
View File

@ -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);

6
source/blender/blenlib/intern/string_utils.c
View File

@ -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;