Browse Source

str_convert_to_input() never returns NULL.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Andrew Borodin 7 years ago
parent
commit
9b74ff8653
4 changed files with 9 additions and 21 deletions
  1. 2 5
      src/diffviewer/search.c
  2. 3 6
      src/editor/editcmd.c
  3. 2 5
      src/editor/editcmd_dialogs.c
  4. 2 5
      src/viewer/dialogs.c

+ 2 - 5
src/diffviewer/search.c

@@ -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
 

+ 3 - 6
src/editor/editcmd.c

@@ -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);
 }

+ 2 - 5
src/editor/editcmd_dialogs.c

@@ -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
 

+ 2 - 5
src/viewer/dialogs.c

@@ -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