Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge char_non_ascii() into has_non_ascii_chars()

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-12-23 23:46:41 +01:00
parent 05fc53ba32
commit bdc65ead7a
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/charset.cpp
View File

@@ -33,23 +33,10 @@
namespace namespace
{ {
inline bool char_non_ascii(char ch)
{
return (ch & 0x80) != 0;
}
bool has_non_ascii_chars(const char *s) bool has_non_ascii_chars(const char *s)
{ {
for (; *s; ++s) for (; *s; ++s)
if (char_non_ascii(*s)) if (*s & 0x80)
return true;
return false;
}
bool has_non_ascii_chars(const std::string &s)
{
for (std::string::const_iterator it = s.begin(); it != s.end(); ++it)
if (char_non_ascii(*it))
return true; return true;
return false; return false;
} }
@@ -88,7 +75,7 @@ namespace
void utf_to_locale(std::string &s) void utf_to_locale(std::string &s)
{ {
if (s.empty() || Config.system_encoding.empty() || !has_non_ascii_chars(s)) if (s.empty() || Config.system_encoding.empty() || !has_non_ascii_chars(s.c_str()))
return; return;
const char *tmp = strdup(s.c_str()); const char *tmp = strdup(s.c_str());
charset_convert("utf-8", Config.system_encoding.c_str(), tmp, 1, s.length()); charset_convert("utf-8", Config.system_encoding.c_str(), tmp, 1, s.length());
@@ -105,7 +92,7 @@ std::string utf_to_locale_cpy(const std::string &s)
void locale_to_utf(std::string &s) void locale_to_utf(std::string &s)
{ {
if (s.empty() || Config.system_encoding.empty() || !has_non_ascii_chars(s)) if (s.empty() || Config.system_encoding.empty() || !has_non_ascii_chars(s.c_str()))
return; return;
const char *tmp = strdup(s.c_str()); const char *tmp = strdup(s.c_str());
charset_convert(Config.system_encoding.c_str(), "utf-8", tmp, 1, s.length()); charset_convert(Config.system_encoding.c_str(), "utf-8", tmp, 1, s.length());