mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 10:04:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

str_convert_to_input() never returns NULL.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2018-01-21 11:59:12 +03:00
parent 454e23d48f
commit 9b74ff8653
4 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/diffviewer/search.c
View File

@ -123,11 +123,8 @@ mcdiffview_dialog_search (WDiff * dview)
GString *tmp;
tmp = str_convert_to_input (exp);
if (tmp != NULL)
{
g_free (exp);
exp = g_string_free (tmp, FALSE);
}
g_free (exp);
exp = g_string_free (tmp, FALSE);
}
#endif

9
src/editor/editcmd.c
View File

@ -922,12 +922,9 @@ edit_replace_cmd__conv_to_input (char *str)
GString *tmp;
tmp = str_convert_to_input (str);
if (tmp != NULL)
{
if (tmp->len != 0)
return g_string_free (tmp, FALSE);
g_string_free (tmp, TRUE);
}
if (tmp->len != 0)
return g_string_free (tmp, FALSE);
g_string_free (tmp, TRUE);
#endif
return g_strdup (str);
}

7
src/editor/editcmd_dialogs.c
View File

@ -150,11 +150,8 @@ editcmd_dialog_search_show (WEdit * edit)
GString *tmp;
tmp = str_convert_to_input (search_text);
if (tmp != NULL)
{
g_free (search_text);
search_text = g_string_free (tmp, FALSE);
}
g_free (search_text);
search_text = g_string_free (tmp, FALSE);
}
#endif

7
src/viewer/dialogs.c
View File

@ -128,11 +128,8 @@ mcview_dialog_search (WView * view)
GString *tmp;
tmp = str_convert_to_input (exp);
if (tmp != NULL)
{
g_free (exp);
exp = g_string_free (tmp, FALSE);
}
g_free (exp);
exp = g_string_free (tmp, FALSE);
}
#endif