[Bf-blender-cvs] [5357474] master: Fix building with very strict flags, use size_t rather than int for string length.
Bastien Montagne
noreply at git.blender.org
Sat Jan 10 19:16:22 CET 2015
Commit: 5357474ad8b81ce0e41907d99e9636fcc7c3a6f6
Author: Bastien Montagne
Date: Sat Jan 10 19:13:38 2015 +0100
Branches: master
https://developer.blender.org/rB5357474ad8b81ce0e41907d99e9636fcc7c3a6f6
Fix building with very strict flags, use size_t rather than int for string length.
Reported on bf-committers.
===================================================================
M source/blender/blenlib/BLI_string.h
M source/blender/blenlib/intern/string.c
M source/blender/editors/animation/keyframes_general.c
===================================================================
diff --git a/source/blender/blenlib/BLI_string.h b/source/blender/blenlib/BLI_string.h
index 54eb764..c4853e3 100644
--- a/source/blender/blenlib/BLI_string.h
+++ b/source/blender/blenlib/BLI_string.h
@@ -86,7 +86,7 @@ int BLI_str_index_in_array_n(const char *__restrict str, const char **__restrict
int BLI_str_index_in_array(const char *__restrict str, const char **__restrict str_array) ATTR_NONNULL();
bool BLI_str_endswith(const char *__restrict str, const char *__restrict end) ATTR_NONNULL();
-bool BLI_strn_endswith(const char *__restrict str, const char *__restrict end, int length) ATTR_NONNULL();
+bool BLI_strn_endswith(const char *__restrict str, const char *__restrict end, size_t length) ATTR_NONNULL();
size_t BLI_str_partition(const char *str, const char delim[], char **sep, char **suf) ATTR_NONNULL();
size_t BLI_str_rpartition(const char *str, const char delim[], char **sep, char **suf) ATTR_NONNULL();
diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c
index f7ac844..cc5a90d 100644
--- a/source/blender/blenlib/intern/string.c
+++ b/source/blender/blenlib/intern/string.c
@@ -773,9 +773,9 @@ int BLI_str_index_in_array(const char *__restrict str, const char **__restrict s
return -1;
}
-bool BLI_strn_endswith(const char *__restrict str, const char *__restrict end, int slength)
+bool BLI_strn_endswith(const char *__restrict str, const char *__restrict end, size_t slength)
{
- int elength = strlen(end);
+ size_t elength = strlen(end);
if (elength < slength) {
const char *iter = &str[slength - elength];
@@ -798,7 +798,7 @@ bool BLI_strn_endswith(const char *__restrict str, const char *__restrict end, i
*/
bool BLI_str_endswith(const char *__restrict str, const char *end)
{
- int slength = strlen(str);
+ const size_t slength = strlen(str);
return BLI_strn_endswith(str, end, slength);
}
diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c
index 6d73cd0..6acff13 100644
--- a/source/blender/editors/animation/keyframes_general.c
+++ b/source/blender/editors/animation/keyframes_general.c
@@ -747,7 +747,7 @@ static tAnimCopybufItem *pastebuf_match_index_only(FCurve *fcu, const short from
static void do_curve_mirror_flippping(tAnimCopybufItem *aci, BezTriple *bezt)
{
if (aci->is_bone) {
- int slength = strlen(aci->rna_path);
+ const size_t slength = strlen(aci->rna_path);
bool flip = false;
if (BLI_strn_endswith(aci->rna_path, "location", slength) && aci->array_index == 0)
flip = true;
More information about the Bf-blender-cvs
mailing list