optimize away a boatload of strdups during update

git-svn-id: https://svn.musicpd.org/mpd/trunk@3718 09075e82-0dd4-0310-85a5-a0d7c8717e4f

optimize away a boatload of strdups during update
f628fa1c · Eric Wong · f8597ccf · f628fa1c
Commit f628fa1c authored Dec 05, 2005 by Eric Wong
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

charConv.c src/charConv.c +10 -3

No files found.
--- a/src/charConv.c
+++ b/src/charConv.c
@@ -42,10 +42,17 @@ mpd_sint8 char_conv_latin1ToUtf8 = 0;
 #define BUFFER_SIZE	1024

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

 	closeCharSetConversion();