oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Moving pathConvCharset to charConv.c so it can be reused for localization.

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@5226 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
J. Alexander Treuman 2007-01-08 03:28:36 +00:00
parent bcb493cfd3
commit 90b4af0341
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/charConv.c
View File

@ -150,6 +150,13 @@ char *convStrDup(char *string)
return NULL; return NULL;
} }
char *convCharset(char *to, char *from, char *str, char *ret)
{
if (ret)
free(ret);
return setCharSetConversion(to, from) ? NULL : convStrDup(str);
}
static void closeCharSetConversion(void) static void closeCharSetConversion(void)
{ {
if (char_conv_to) { if (char_conv_to) {

2
src/charConv.h
View File

@ -25,4 +25,6 @@ int setCharSetConversion(char *to, char *from);
char *convStrDup(char *string); char *convStrDup(char *string);
char *convCharset(char *to, char *from, char *str, char *ret);
#endif #endif

11
src/path.c
View File

@ -36,18 +36,11 @@ const char *musicDir;
static const char *playlistDir; static const char *playlistDir;
static char *fsCharset = NULL; static char *fsCharset = NULL;
static char *pathConvCharset(char *to, char *from, char *str, char *ret)
{
if (ret)
free(ret);
return setCharSetConversion(to, from) ? NULL : convStrDup(str);
}
char *fsCharsetToUtf8(char *str) char *fsCharsetToUtf8(char *str)
{ {
static char *ret = NULL; static char *ret = NULL;
ret = pathConvCharset("UTF-8", fsCharset, str, ret); ret = convCharset("UTF-8", fsCharset, str, ret);
if (ret && !validUtf8String(ret)) { if (ret && !validUtf8String(ret)) {
free(ret); free(ret);
@ -61,7 +54,7 @@ char *utf8ToFsCharset(char *str)
{ {
static char *ret = NULL; static char *ret = NULL;
ret = pathConvCharset(fsCharset, "UTF-8", str, ret); ret = convCharset(fsCharset, "UTF-8", str, ret);
if (!ret) if (!ret)
ret = xstrdup(str); ret = xstrdup(str);