From: Steinar H. Gunderson <sesse@samfundet.no>
Date: Sat, 19 Feb 2005 02:26:44 +0000 (+0000)
Subject: Moved all the UCS-4 junk into operator=, where it belongs.
X-Git-Url: https://git.sesse.net/?p=ccbs;a=commitdiff_plain;h=703fd7eae11c453e83954b6d7a3197eb7ba85143

Moved all the UCS-4 junk into operator=, where it belongs.
---

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index da78fa1..962de50 100644
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -11,6 +11,34 @@ iconv_t ucs4_iconv;
 class widestring : public std::basic_string<unsigned>
 {
 public:
+	void operator= (const char *from)
+	{
+		unsigned bytes = std::strlen(from);
+		char *from_buf = strdup(from);
+		unsigned *to_buf = new unsigned[bytes + 1];
+
+		char *inptr = from_buf, *outptr = reinterpret_cast<char *> (to_buf);
+
+		size_t in_left = bytes;
+		size_t out_left = bytes * sizeof(unsigned);
+
+		size_t ret = iconv(ucs4_iconv, NULL, NULL, &outptr, &out_left);
+		if (ret == (size_t)(-1)) {
+			throw std::runtime_error("Error in iconv during initialization");
+		}
+
+		ret = iconv(ucs4_iconv, &inptr, &in_left, &outptr, &out_left);
+		if (ret == (size_t)(-1)) {
+			perror("iconv");
+			throw std::runtime_error("Error in iconv during conversion");
+		}
+
+		erase(begin(), end());
+		std::copy(to_buf, reinterpret_cast<unsigned *> (outptr), std::back_inserter(*this));
+
+		free(from_buf);
+		delete[] to_buf;
+	}
 };
 
 template<>
@@ -43,31 +71,7 @@ unsigned *std::char_traits<unsigned>::assign(unsigned *to, size_t n, unsigned a)
 template<>
 void pqxx::from_string<widestring>(const char *from, widestring &to)
 {
-	unsigned bytes = std::strlen(from);
-	char *from_buf = strdup(from);
-	unsigned *to_buf = new unsigned[bytes + 1];
-	
-	char *inptr = from_buf, *outptr = reinterpret_cast<char *> (to_buf);
-	
-	size_t in_left = bytes;
-	size_t out_left = bytes * sizeof(unsigned);
-
-	size_t ret = iconv(ucs4_iconv, NULL, NULL, &outptr, &out_left);
-	if (ret == (size_t)(-1)) {
-		throw std::runtime_error("Error in iconv during initialization");
-	}
-
-	ret = iconv(ucs4_iconv, &inptr, &in_left, &outptr, &out_left);
-	if (ret == (size_t)(-1)) {
-		perror("iconv");
-		throw std::runtime_error("Error in iconv during conversion");
-	}
-
-	to.erase(to.begin(), to.end());
-	std::copy(to_buf, reinterpret_cast<unsigned *> (outptr), std::back_inserter(to));
-
-	free(from_buf);
-	delete[] to_buf;
+	to = from;
 }
 
 class Tournament {
@@ -122,7 +126,7 @@ public:
 			tourn->name = tournament["tournamentname"].as(tourn->name);
 		} catch (PGSTD::out_of_range &e) {
 			tourn->id = -1;
-//			tourn->name = "";
+			tourn->name = "";
 		}
 	}
 };