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

path: don't allocate charset twice

Browse Source 
Make the local variable "charset" const, and don't duplicate its
value.  It is already duplicated by path_set_fs_charset().
This commit is contained in:
Max Kellermann 2008-11-05 18:26:45 +01:00
parent 6a7a26fe42
commit 2a1a37107f
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/path.c
View File

@ -89,22 +89,20 @@ const char *path_get_fs_charset(void)
void path_global_init(void) void path_global_init(void)
{ {
ConfigParam *fs_charset_param = getConfigParam(CONF_FS_CHARSET); ConfigParam *fs_charset_param = getConfigParam(CONF_FS_CHARSET);
const char *charset = NULL;
char *charset = NULL;
if (fs_charset_param) { if (fs_charset_param) {
charset = xstrdup(fs_charset_param->value); charset = fs_charset_param->value;
} else { } else {
const gchar **encodings; const gchar **encodings;
g_get_filename_charsets(&encodings); g_get_filename_charsets(&encodings);
if (encodings[0] != NULL && *encodings[0] != '\0') if (encodings[0] != NULL && *encodings[0] != '\0')
charset = g_strdup(encodings[0]); charset = encodings[0];
} }
if (charset) { if (charset) {
path_set_fs_charset(charset); path_set_fs_charset(charset);
free(charset);
} else { } else {
WARNING("setting filesystem charset to ISO-8859-1\n"); WARNING("setting filesystem charset to ISO-8859-1\n");
path_set_fs_charset("ISO-8859-1"); path_set_fs_charset("ISO-8859-1");