diff --git a/src/charset.c b/src/charset.c
index 157e022e48a0c3bd30c34544cdfcce786d547ec7..61a34cbcf449a6dd0eb870cfc9dd239d83109cf5 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
* Project homepage: http://musicpd.org
*
* This program is free software; you can redistribute it and/or modify
static inline unsigned
unicode_char_width(gunichar ch)
{
-#if GLIB_CHECK_VERSION(2,14,0)
if (g_unichar_iszerowidth(ch))
return 0;
-#endif
if (g_unichar_iswide(ch))
return 2;
#endif
}
-static inline unsigned
+gcc_unused
+static unsigned
ascii_cut_width(char *p, unsigned max_width)
{
size_t length = strlen(p);
return max_width;
}
-static inline unsigned
+gcc_unused
+static unsigned
narrow_cut_width(char *p, unsigned max_width)
{
size_t length = g_utf8_strlen(p, -1);
return max_width;
}
-static inline unsigned
+gcc_unused
+static unsigned
wide_cut_width(char *p, unsigned max_width)
{
size_t length = g_utf8_strlen(p, -1);
unsigned width = 0, prev_width;
- gunichar c;
while (length-- > 0) {
- c = g_utf8_get_char(p);
+ gunichar c = g_utf8_get_char(p);
prev_width = width;
width += g_unichar_iswide(c) ? 2 : 1;
if (width > max_width) {
utf8_to_locale(const char *utf8str)
{
#ifdef ENABLE_LOCALE
- gchar *str;
-
assert(utf8str != NULL);
if (noconvert)
return g_strdup(utf8str);
- str = g_convert_with_fallback(utf8str, -1,
- charset, "utf-8",
- NULL, NULL, NULL, NULL);
+ gchar *str = g_convert_with_fallback(utf8str, -1,
+ charset, "utf-8",
+ NULL, NULL, NULL, NULL);
if (str == NULL)
return g_strdup(utf8str);
locale_to_utf8(const char *localestr)
{
#ifdef ENABLE_LOCALE
- gchar *str;
-
assert(localestr != NULL);
if (noconvert)
return g_strdup(localestr);
- str = g_convert_with_fallback(localestr, -1,
- "utf-8", charset,
- NULL, NULL, NULL, NULL);
+ gchar *str = g_convert_with_fallback(localestr, -1,
+ "utf-8", charset,
+ NULL, NULL, NULL, NULL);
if (str == NULL)
return g_strdup(localestr);