Leverage string_policy().

This commit is contained in:
Xavier G 2016-05-13 02:27:19 +02:00
commit 21c07c0060
4 changed files with 9 additions and 8 deletions

View file

@ -28,9 +28,9 @@
/* Provide is_utf8(): */
#include "recode.h"
int string_advance(char const **str, gboolean utf8)
int string_advance(char const **str, int policy)
{
if (utf8) {
if (policy == TREAT_STRING_AS_UTF8) {
gunichar c;
c = g_utf8_get_char(*str);
@ -38,6 +38,7 @@ int string_advance(char const **str, gboolean utf8)
return unichar_isprint(c) ? mk_wcwidth(c) : 1;
} else {
/* Assume TREAT_STRING_AS_BYTES: */
*str += 1;
return 1;

View file

@ -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 string_advance(char const **str, gboolean utf8);
int string_advance(char const **str, int policy);
/* TREAT_STRING_AS_BYTES means strings are to be treated using strncpy,
* strnlen, etc.