core: remove function gui_buffer_match_list_split, use function string_match_list

3 files changed, 9 insertions, 48 deletions

diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c
index bad110093..100049e58 100644
--- a/src/gui/gui-buffer.c
+++ b/src/gui/gui-buffer.c
@@ -995,43 +995,6 @@ gui_buffer_string_replace_local_var (struct t_gui_buffer *buffer,
 }
 
 /*
- * Checks if full name of buffer matches (split) list of buffers.
- *
- * Returns:
- *   1: full name matches list of buffers
- *   0: full name does not match list of buffers
- */
-
-int
-gui_buffer_match_list_split (struct t_gui_buffer *buffer,
-                             int num_buffers, char **buffers)
-{
-    int i, match;
-    char *ptr_name;
-
-    if (!buffer)
-        return 0;
-
-    match = 0;
-
-    for (i = 0; i < num_buffers; i++)
-    {
-        ptr_name = buffers[i];
-        if (ptr_name[0] == '!')
-            ptr_name++;
-        if (string_match (buffer->full_name, ptr_name, 0))
-        {
-            if (buffers[i][0] == '!')
-                return 0;
-            else
-                match = 1;
-        }
-    }
-
-    return match;
-}
-
-/*
  * Checks if full name of buffer marches list of buffers.
  *
  * List is a comma-separated list of buffers, where exclusion is possible with
@@ -1049,17 +1012,18 @@ int
 gui_buffer_match_list (struct t_gui_buffer *buffer, const char *string)
 {
     char **buffers;
-    int num_buffers, match;
+    int match;
 
     if (!buffer || !string || !string[0])
         return 0;
 
     match = 0;
 
-    buffers = string_split (string, ",", 0, 0, &num_buffers);
+    buffers = string_split (string, ",", 0, 0, NULL);
     if (buffers)
     {
-        match = gui_buffer_match_list_split (buffer, num_buffers, buffers);
+        match = string_match_list (buffer->full_name,
+                                   (const char **)buffers, 0);
         string_free_split (buffers);
     }
 
diff --git a/src/gui/gui-buffer.h b/src/gui/gui-buffer.h
index bdb3ce196..38582cd23 100644
--- a/src/gui/gui-buffer.h
+++ b/src/gui/gui-buffer.h
@@ -270,8 +270,6 @@ extern void gui_buffer_user_set_callbacks ();
 extern int gui_buffer_valid (struct t_gui_buffer *buffer);
 extern char *gui_buffer_string_replace_local_var (struct t_gui_buffer *buffer,
                                                   const char *string);
-extern int gui_buffer_match_list_split (struct t_gui_buffer *buffer,
-                                        int num_buffers, char **buffers);
 extern int gui_buffer_match_list (struct t_gui_buffer *buffer,
                                   const char *string);
 extern void gui_buffer_set_plugin_for_upgrade (char *name,
diff --git a/src/gui/gui-filter.c b/src/gui/gui-filter.c
index 349ac8f75..31c9b19a2 100644
--- a/src/gui/gui-filter.c
+++ b/src/gui/gui-filter.c
@@ -75,9 +75,9 @@ gui_filter_check_line (struct t_gui_line_data *line_data)
         if (ptr_filter->enabled)
         {
             /* check buffer */
-            if (gui_buffer_match_list_split (line_data->buffer,
-                                             ptr_filter->num_buffers,
-                                             ptr_filter->buffers))
+            if (string_match_list (line_data->buffer->full_name,
+                                   (const char **)ptr_filter->buffers,
+                                   0))
             {
                 if ((strcmp (ptr_filter->tags, "*") == 0)
                     || (gui_line_match_tags (line_data,
@@ -200,9 +200,8 @@ gui_filter_all_buffers (struct t_gui_filter *filter)
          ptr_buffer = ptr_buffer->next_buffer)
     {
         if (!filter
-            || gui_buffer_match_list_split (ptr_buffer,
-                                            filter->num_buffers,
-                                            filter->buffers))
+            || string_match_list (ptr_buffer->full_name,
+                                  (const char **)filter->buffers, 0))
         {
             gui_filter_buffer (ptr_buffer, NULL);
         }