aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-02-02 15:08:01 -05:00
Code

Rename advance() into string_advance().

Browse Source
This commit is contained in:
Xavier G 2016-05-13 01:52:37 +02:00
parent 5c74a3bb88
commit b0afcc96db
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/utf8.c
View File

@ -26,7 +26,7 @@
#include "module.h" #include "module.h"
#include "wcwidth.c" #include "wcwidth.c"
int advance(char const **str, gboolean utf8) int string_advance(char const **str, gboolean utf8)
{ {
if (utf8) { if (utf8) {
gunichar c; gunichar c;

2
src/core/utf8.h
View File

@ -17,7 +17,7 @@ int mk_wcwidth(unichar c);
/* Advance the str pointer one character further; return the number of columns /* Advance the str pointer one character further; return the number of columns
* occupied by the skipped character. * occupied by the skipped character.
*/ */
int advance(char const **str, gboolean utf8); int string_advance(char const **str, gboolean utf8);
#define unichar_isprint(c) (((c) & ~0x80) >= 32) #define unichar_isprint(c) (((c) & ~0x80) >= 32)
#define is_utf8_leading(c) (((c) & 0xc0) != 0x80) #define is_utf8_leading(c) (((c) & 0xc0) != 0x80)

4
src/fe-common/core/formats.c
View File

@ -449,7 +449,7 @@ int format_get_length(const char *str)
len++; len++;
} }
len += advance(&str, utf8); len += string_advance(&str, utf8);
} }
g_string_free(tmp, TRUE); g_string_free(tmp, TRUE);
@ -491,7 +491,7 @@ int format_real_length(const char *str, int len)
} }
oldstr = str; oldstr = str;
len -= advance(&str, utf8); len -= string_advance(&str, utf8);
if (len < 0) if (len < 0)
str = oldstr; str = oldstr;
} }