release v0.29

[ncmpc.git] / src / utils.c

diff --git a/src/utils.c b/src/utils.c
index 9241296f69704eb09805a27b90f09629eadb33b0..0c35c9e8e14089efb7483fe1c36374f0ad01221d 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,7 +1,6 @@
-/* 
- * $Id$
- *
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
+/* ncmpc (Ncurses MPD Client)
+ * (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
  * it under the terms of the GNU General Public License as published by
@@ -12,33 +11,21 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "utils.h"
-#include "ncmpc.h"
-#include "options.h"
-#include "support.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;
 }
 
@@ -70,52 +57,3 @@ string_list_remove(GList *string_list, const gchar *str)
        }
        return list;
 }
-
-/* create a list suiteble for GCompletion from path */
-GList *
-gcmp_list_from_path(mpdclient_t *c, const gchar *path, GList *list, gint types)
-{
-       GList *flist = NULL;
-       mpdclient_filelist_t *filelist;
-
-       if ((filelist = mpdclient_filelist_get(c, path)) == NULL)
-               return list;
-
-       D("retrieved filelist!\n");
-       flist = filelist->list;
-       while (flist) {
-               filelist_entry_t *entry = flist->data;
-               mpd_InfoEntity *entity = entry ? entry->entity : NULL;
-               char *name = NULL;
-
-               if (entity && entity->type==MPD_INFO_ENTITY_TYPE_DIRECTORY &&
-                   types & GCMP_TYPE_DIR) {
-                       mpd_Directory *dir = entity->info.directory;
-                       gchar *tmp = utf8_to_locale(dir->path);
-                       gsize size = strlen(tmp)+2;
-
-                       name = g_malloc(size);
-                       g_strlcpy(name, tmp, size);
-                       g_strlcat(name, "/", size);
-                       g_free(tmp);
-               } else if (entity &&
-                          entity->type == MPD_INFO_ENTITY_TYPE_SONG &&
-                          types & GCMP_TYPE_FILE) {
-                       mpd_Song *song = entity->info.song;
-                       name = utf8_to_locale(song->file);
-               } else if (entity &&
-                          entity->type == MPD_INFO_ENTITY_TYPE_PLAYLISTFILE &&
-                          types & GCMP_TYPE_PLAYLIST) {
-                       mpd_PlaylistFile *plf = entity->info.playlistFile;
-                       name = utf8_to_locale(plf->path);
-               }
-
-               if (name)
-                       list = g_list_append(list, name);
-
-               flist = flist->next;
-       }
-
-       mpdclient_filelist_free(filelist);
-       return list;
-}