mirror of
https://github.com/irssi/irssi.git
synced 2024-12-04 14:46:39 -05:00
Rename advance() into string_advance().
This commit is contained in:
parent
5c74a3bb88
commit
b0afcc96db
@ -26,7 +26,7 @@
|
||||
#include "module.h"
|
||||
#include "wcwidth.c"
|
||||
|
||||
int advance(char const **str, gboolean utf8)
|
||||
int string_advance(char const **str, gboolean utf8)
|
||||
{
|
||||
if (utf8) {
|
||||
gunichar c;
|
||||
|
@ -17,7 +17,7 @@ int mk_wcwidth(unichar c);
|
||||
/* Advance the str pointer one character further; return the number of columns
|
||||
* 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 is_utf8_leading(c) (((c) & 0xc0) != 0x80)
|
||||
|
@ -449,7 +449,7 @@ int format_get_length(const char *str)
|
||||
len++;
|
||||
}
|
||||
|
||||
len += advance(&str, utf8);
|
||||
len += string_advance(&str, utf8);
|
||||
}
|
||||
|
||||
g_string_free(tmp, TRUE);
|
||||
@ -491,7 +491,7 @@ int format_real_length(const char *str, int len)
|
||||
}
|
||||
|
||||
oldstr = str;
|
||||
len -= advance(&str, utf8);
|
||||
len -= string_advance(&str, utf8);
|
||||
if (len < 0)
|
||||
str = oldstr;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user