From ea1f1fe0c20ab41fb9c9d332e7317d04a3bf0baf Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 8 Jul 2014 06:06:34 +1000 Subject: BLI_string, dont pass unicode to ascii BLI_str_partition functions --- source/blender/blenlib/intern/string.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/blenlib/intern/string.c') diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c index 87233d26439..f396abbeb8d 100644 --- a/source/blender/blenlib/intern/string.c +++ b/source/blender/blenlib/intern/string.c @@ -690,7 +690,7 @@ int BLI_str_index_in_array(const char *str, const char **str_array) * \param suf Return value, set to next char after the first delimiter found (or NULL if none found). * \return The length of the prefix (i.e. *sep - str). */ -size_t BLI_str_partition(const char *str, const unsigned int delim[], char **sep, char **suf) +size_t BLI_str_partition(const char *str, const char delim[], char **sep, char **suf) { return BLI_str_partition_ex(str, delim, sep, suf, false); } @@ -704,7 +704,7 @@ size_t BLI_str_partition(const char *str, const unsigned int delim[], char **sep * \param suf Return value, set to next char after the first delimiter found (or NULL if none found). * \return The length of the prefix (i.e. *sep - str). */ -size_t BLI_str_rpartition(const char *str, const unsigned int delim[], char **sep, char **suf) +size_t BLI_str_rpartition(const char *str, const char delim[], char **sep, char **suf) { return BLI_str_partition_ex(str, delim, sep, suf, true); } @@ -719,15 +719,15 @@ size_t BLI_str_rpartition(const char *str, const unsigned int delim[], char **se * \param from_right If %true, search from the right of \a str, else, search from its left. * \return The length of the prefix (i.e. *sep - str). */ -size_t BLI_str_partition_ex(const char *str, const unsigned int delim[], char **sep, char **suf, const bool from_right) +size_t BLI_str_partition_ex(const char *str, const char delim[], char **sep, char **suf, const bool from_right) { - const unsigned int *d; + const char *d; char *(*func)(const char *str, int c) = from_right ? strrchr : strchr; *sep = *suf = NULL; for (d = delim; *d != '\0'; ++d) { - char *tmp = func(str, (int)*d); + char *tmp = func(str, *d); if (tmp && (from_right ? (*sep < tmp) : (!*sep || *sep > tmp))) { *sep = tmp; -- cgit v1.2.3