utils: move gcmp_list_from_path() to db_completion.c

[ncmpc.git] / src / utils.c

diff --git a/src/utils.c b/src/utils.c
index fb79aeb39af8520265d0d2983cb21c8cffd477ea..8f867ad36b87130d339b803bdde1ca2f4d366238 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,27 +18,15 @@
  */
 
 #include "utils.h"
-#include "options.h"
-#include "charset.h"
 #include "i18n.h"
-#include "mpdclient.h"
 
-#include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 
 GList *
 string_list_free(GList *string_list)
 {
-       GList *list = g_list_first(string_list);
-
-       while (list) {
-               g_free(list->data);
-               list->data = NULL;
-               list = list->next;
-       }
-
-       g_list_free(string_list);
+       g_list_free_full(string_list, g_free);
        return NULL;
 }
 
@@ -71,54 +59,6 @@ string_list_remove(GList *string_list, const gchar *str)
        return list;
 }
 
-/* create a list suitable for GCompletion from path */
-GList *
-gcmp_list_from_path(struct mpdclient *c, const gchar *path,
-                   GList *list, gint types)
-{
-       struct mpd_connection *connection = mpdclient_get_connection(c);
-       if (connection == NULL)
-               return list;
-
-       mpd_send_list_meta(connection, path);
-
-       struct mpd_entity *entity;
-       while ((entity = mpd_recv_entity(connection)) != NULL) {
-               char *name;
-
-               if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_DIRECTORY &&
-                   types & GCMP_TYPE_DIR) {
-                       const struct mpd_directory *dir =
-                               mpd_entity_get_directory(entity);
-                       gchar *tmp = utf8_to_locale(mpd_directory_get_path(dir));
-                       gsize size = strlen(tmp)+2;
-
-                       name = g_malloc(size);
-                       g_strlcpy(name, tmp, size);
-                       g_strlcat(name, "/", size);
-                       g_free(tmp);
-               } else if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_SONG &&
-                          types & GCMP_TYPE_FILE) {
-                       const struct mpd_song *song =
-                               mpd_entity_get_song(entity);
-                       name = utf8_to_locale(mpd_song_get_uri(song));
-               } else if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_PLAYLIST &&
-                          types & GCMP_TYPE_PLAYLIST) {
-                       const struct mpd_playlist *playlist =
-                               mpd_entity_get_playlist(entity);
-                       name = utf8_to_locale(mpd_playlist_get_path(playlist));
-               } else {
-                       mpd_entity_free(entity);
-                       continue;
-               }
-
-               list = g_list_append(list, name);
-               mpd_entity_free(entity);
-       }
-
-       return list;
-}
-
 void
 format_duration_short(char *buffer, size_t length, unsigned duration)
 {