mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 04:22:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

(load_panelize): replace while() by for() and fix potential memory leak.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2013-08-07 16:54:57 +04:00
parent bb142bf47f
commit 13c8f5213b
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/filemanager/panelize.c
View File

@ -565,17 +565,14 @@ external_panelize (void)
void
load_panelize (void)
{
gchar **profile_keys, **keys;
char **keys;
gsize len;
GIConv conv;
conv = str_crt_conv_from ("UTF-8");
profile_keys = keys = mc_config_get_keys (mc_main_config, panelize_section, &len);
keys = mc_config_get_keys (mc_main_config, panelize_section, &len);
add2panelize (g_strdup (_("Other command")), g_strdup (""));
if (!profile_keys || *profile_keys == NULL)
if (keys == NULL || *keys == NULL)
{
add2panelize (g_strdup (_("Modified git files")), g_strdup ("git ls-files --modified"));
add2panelize (g_strdup (_("Find rejects after patching")),
@ -585,29 +582,36 @@ load_panelize (void)
add2panelize (g_strdup (_("Find SUID and SGID programs")),
g_strdup
("find . \\( \\( -perm -04000 -a -perm +011 \\) -o \\( -perm -02000 -a -perm +01 \\) \\) -print"));
return;
}
while (*profile_keys)
else
{
GString *buffer;
GIConv conv;
char **profile_keys;
if (mc_global.utf8_display || conv == INVALID_CONV)
buffer = g_string_new (*profile_keys);
else
conv = str_crt_conv_from ("UTF-8");
for (profile_keys = keys; *profile_keys != NULL; profile_keys++)
{
buffer = g_string_new ("");
if (str_convert (conv, *profile_keys, buffer) == ESTR_FAILURE)
g_string_assign (buffer, *profile_keys);
GString *buffer;
if (mc_global.utf8_display || conv == INVALID_CONV)
buffer = g_string_new (*profile_keys);
else
{
buffer = g_string_new ("");
if (str_convert (conv, *profile_keys, buffer) == ESTR_FAILURE)
g_string_assign (buffer, *profile_keys);
}
add2panelize (g_string_free (buffer, FALSE),
mc_config_get_string (mc_main_config, panelize_section, *profile_keys,
""));
}
add2panelize (g_string_free (buffer, FALSE),
mc_config_get_string (mc_main_config, panelize_section, *profile_keys, ""));
profile_keys++;
str_close_conv (conv);
}
g_strfreev (keys);
str_close_conv (conv);
}
/* --------------------------------------------------------------------------------------------- */