diff --git a/src/utils.c b/src/utils.c
index 01413648015d5e4675bde9d5316d20e000a12ccd..9241296f69704eb09805a27b90f09629eadb33b0 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
*
*/
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <glib.h>
-
-#include "config.h"
+#include "utils.h"
#include "ncmpc.h"
#include "options.h"
#include "support.h"
-#include "mpdclient.h"
-#include "utils.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);
- return NULL;
+ GList *list = g_list_first(string_list);
+
+ while (list) {
+ g_free(list->data);
+ list->data = NULL;
+ list = list->next;
+ }
+
+ g_list_free(string_list);
+ return NULL;
}
GList *
-string_list_find(GList *string_list, gchar *str)
+string_list_find(GList *string_list, const gchar *str)
{
GList *list = g_list_first(string_list);
}
GList *
-string_list_remove(GList *string_list, gchar *str)
+string_list_remove(GList *string_list, const gchar *str)
{
GList *list = g_list_first(string_list);
/* create a list suiteble for GCompletion from path */
GList *
-gcmp_list_from_path(mpdclient_t *c, gchar *path, GList *list, gint types)
+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);
- }
+ 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( name )
- list = g_list_append(list, name);
+ 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;
- flist = flist->next;
- }
- mpdclient_filelist_free(filelist);
- return list;
+ 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;
}