diff options
| author | Warren Dukes <warren.dukes@gmail.com> | 2006-01-25 01:35:28 +0000 |
|---|---|---|
| committer | Warren Dukes <warren.dukes@gmail.com> | 2006-01-25 01:35:28 +0000 |
| commit | bd561dec2733b0afb101d47e7a896af7ff67dfd1 (patch) | |
| tree | 2d77ca977e624287e8810ca010ad8591703e2c75 | |
| parent | 03c60a28e23c9d99fb1b1503b9fc30808687bc42 (diff) | |
| download | mpd-bd561dec2733b0afb101d47e7a896af7ff67dfd1.tar.gz mpd-bd561dec2733b0afb101d47e7a896af7ff67dfd1.tar.xz mpd-bd561dec2733b0afb101d47e7a896af7ff67dfd1.zip | |
fix bug 544
git-svn-id: https://svn.musicpd.org/mpd/trunk@3859 09075e82-0dd4-0310-85a5-a0d7c8717e4f
| -rw-r--r-- | src/charConv.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/charConv.c b/src/charConv.c index b12bfb751..2ca786668 100644 --- a/src/charConv.c +++ b/src/charConv.c @@ -42,17 +42,10 @@ mpd_sint8 char_conv_latin1ToUtf8 = 0; #define BUFFER_SIZE 1024 int setCharSetConversion(char * to, char * from) { - 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; - } + if(char_conv_to && char_conv_from && + strcmp(to,char_conv_to)==0 && strcmp(from,char_conv_from)==0) + { + return 0; } closeCharSetConversion(); |