mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-18 17:29:28 +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

3
src/diffviewer/search.c
View File

@ -123,12 +123,9 @@ mcdiffview_dialog_search (WDiff * dview)
GString *tmp; GString *tmp;
tmp = str_convert_to_input (exp); tmp = str_convert_to_input (exp);
if (tmp != NULL)
{
g_free (exp); g_free (exp);
exp = g_string_free (tmp, FALSE); exp = g_string_free (tmp, FALSE);
} }
}
#endif #endif
g_free (dview->search.last_string); g_free (dview->search.last_string);

3
src/editor/editcmd.c
View File

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

3
src/editor/editcmd_dialogs.c
View File

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

3
src/viewer/dialogs.c
View File

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