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

path.*: cleanups

Browse Source 
utf8.c: add some static's

git-svn-id: https://svn.musicpd.org/mpd/trunk@4311 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Avuton Olrich
2006-07-13 18:09:25 +00:00
parent db2f843995
commit fca9a92ba6
3 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/path.c
View File

@@ -42,23 +42,16 @@ char * playlistDir;
char * fsCharset = NULL;
char * pathConvCharset(char * to, char * from, char * str, char * ret) {
if(ret) {
free(ret);
ret = NULL;
}
static char * pathConvCharset(char * to, char * from, char * str) {
if(setCharSetConversion(to,from)==0) {
ret = convStrDup(str);
return convStrDup(str);
}
return ret;
return NULL;
}
char * fsCharsetToUtf8(char * str) {
static char * ret = NULL;
ret = pathConvCharset("UTF-8",fsCharset,str,ret);
char * ret = pathConvCharset("UTF-8",fsCharset,str);
if(ret && !validUtf8String(ret)) {
free(ret);
@@ -69,9 +62,7 @@ char * fsCharsetToUtf8(char * str) {
}
char * utf8ToFsCharset(char * str) {
static char * ret = NULL;
ret = pathConvCharset(fsCharset,"UTF-8",str,ret);
char * ret = pathConvCharset(fsCharset,"UTF-8",str);
if(!ret) ret = strdup(str);