archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix own mistake in rB051526da6279, confusing off_t with ptrdiff_t.

Browse Source
This commit is contained in:
Bastien Montagne
2017-01-20 21:57:48 +01:00
parent 475d536f72
commit 82187a58f5
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/text.c
View File

@@ -235,8 +235,8 @@ Text *BKE_text_add(Main *bmain, const char *name)
/* to a valid utf-8 sequences */
int txt_extended_ascii_as_utf8(char **str)
{
size_t bad_char, i = 0;
const size_t length = strlen(*str);
ptrdiff_t bad_char, i = 0;
const ptrdiff_t length = (ptrdiff_t)strlen(*str);
int added = 0;
while ((*str)[i]) {
@@ -249,7 +249,7 @@ int txt_extended_ascii_as_utf8(char **str)
if (added != 0) {
char *newstr = MEM_mallocN(length + added + 1, "text_line");
size_t mi = 0;
ptrdiff_t mi = 0;
i = 0;
while ((*str)[i]) {

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

@@ -36,7 +36,7 @@ extern "C" {
char *BLI_strncpy_utf8(char *__restrict dst, const char *__restrict src, size_t maxncpy) ATTR_NONNULL();
size_t BLI_strncpy_utf8_rlen(char *__restrict dst, const char *__restrict src, size_t maxncpy) ATTR_NONNULL();
char *BLI_strncat_utf8(char *__restrict dst, const char *__restrict src, size_t maxncpy) ATTR_NONNULL();
off_t BLI_utf8_invalid_byte(const char *str, size_t length) ATTR_NONNULL();
ptrdiff_t BLI_utf8_invalid_byte(const char *str, size_t length) ATTR_NONNULL();
int BLI_utf8_invalid_strip(char *str, size_t length) ATTR_NONNULL();
int BLI_str_utf8_size(const char *p) ATTR_NONNULL(); /* warning, can return -1 on bad chars */

4
source/blender/blenlib/intern/string_utf8.c
View File

@@ -74,7 +74,7 @@ static const size_t utf8_skip_data[256] = {
*
* \return the offset of the first invalid byte.
*/
off_t BLI_utf8_invalid_byte(const char *str, size_t length)
ptrdiff_t BLI_utf8_invalid_byte(const char *str, size_t length)
{
const unsigned char *p, *perr, *pend = (const unsigned char *)str + length;
unsigned char c;
@@ -171,7 +171,7 @@ utf8_error:
*/
int BLI_utf8_invalid_strip(char *str, size_t length)
{
off_t bad_char;
ptrdiff_t bad_char;
int tot = 0;
BLI_assert(str[length] == '\0');