From bdc65ead7a6d8f96bd5f8a7434c772ab2a4f4d10 Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Wed, 23 Dec 2009 23:46:41 +0100
Subject: [PATCH] merge char_non_ascii() into has_non_ascii_chars()

---
 src/charset.cpp | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/charset.cpp b/src/charset.cpp
index cd9f42ce..43296a59 100644
--- a/src/charset.cpp
+++ b/src/charset.cpp
@@ -33,23 +33,10 @@
 
 namespace
 {
-	inline bool char_non_ascii(char ch)
-	{
-		return (ch & 0x80) != 0;
-	}
-	
 	bool has_non_ascii_chars(const char *s)
 	{
 		for (; *s; ++s)
-			if (char_non_ascii(*s))
-				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))
+			if (*s & 0x80)
 				return true;
 		return false;
 	}
@@ -88,7 +75,7 @@ namespace
 
 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;
 	const char *tmp = strdup(s.c_str());
 	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)
 {
-	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;
 	const char *tmp = strdup(s.c_str());
 	charset_convert(Config.system_encoding.c_str(), "utf-8", tmp, 1, s.length());