diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-03-01 09:43:28 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2006-03-01 09:43:28 +0000 |
| commit | 17d3ccbaa3f22c4c0f8a86515d71fc017a451bbd (patch) | |
| tree | 5b7ff5d88f84effddf3a93cad6e79e690c5844c6 /src/charConv.c | |
| parent | b08ab529940b9af125b9292e6866af10d7a8ae32 (diff) | |
| download | mpd-17d3ccbaa3f22c4c0f8a86515d71fc017a451bbd.tar.gz mpd-17d3ccbaa3f22c4c0f8a86515d71fc017a451bbd.tar.xz mpd-17d3ccbaa3f22c4c0f8a86515d71fc017a451bbd.zip | |
Merge trunk up to r3859 into oggflac
git-svn-id: https://svn.musicpd.org/mpd/branches/oggflac@3908 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/charConv.c')
| -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(); |