charConv: optimize away a boatload of strdups during update (try #2)

This was originally introduced in r3718, but reverted r3859 since the original r3718 commit was incorrect (and I was too excited about the speedup and also lacking in UTF-8 files to notice :x) git-svn-id: https://svn.musicpd.org/mpd/trunk@4517 09075e82-0dd4-0310-85a5-a0d7c8717e4f

charConv: optimize away a boatload of strdups during update (try #2)
83b619e9 · Eric Wong · 468c9900 · 83b619e9
Commit 83b619e9 authored Aug 01, 2006 by Eric Wong
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 4 deletions

charConv.c src/charConv.c +13 -4

No files found.
--- a/src/charConv.c
+++ b/src/charConv.c
@@ -45,10 +45,19 @@ static void closeCharSetConversion();

 int setCharSetConversion(char *to, char *from)
 {
-	if (char_conv_to && char_conv_from &&
-	    strcmp(to, char_conv_to) == 0 && strcmp(from, char_conv_from) == 0)
-	{
-		return 0;
+	if (char_conv_to && char_conv_from) {
+		if (char_conv_latin1ToUtf8 &&
+		    !strcmp(from, char_conv_to) &&
+		    !strcmp(to, char_conv_from)) {
+			char *swap = char_conv_from;
+			char_conv_from = char_conv_to;
+			char_conv_to = swap;
+			char_conv_latin1ToUtf8 *= -1;
+			return 0;
+		} else if (!strcmp(to, char_conv_to) &&
+		           !strcmp(from,char_conv_from)) {
+			return 0;
+		}
 	}

 	closeCharSetConversion();