options: added constant option_table_size

[ncmpc.git] / src / utils.c

diff --git a/src/utils.c b/src/utils.c
index 0f63ff1da3dcb8fc3c906c22bdd7a7c1eef80870..574b8fa49d9eba73d3f19cb5ea393160b1ffb283 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -18,114 +18,102 @@
  *
  */
 
-#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 *list = g_list_first(string_list);
 
-  while(list)
-    {
-      if( strcmp(str, (gchar *) list->data) ==  0 )
-       return list;
-      list = list->next;
-    }
-  return NULL;
+       while(list) {
+               if( strcmp(str, (gchar *) list->data) ==  0 )
+                       return list;
+               list = list->next;
+       }
+       return NULL;
 }
 
 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);
-
-  while(list)
-    {
-      if( strcmp(str, (gchar *) list->data) ==  0 )
-       {
-         g_free(list->data);
-         list->data = NULL;
-         return g_list_delete_link(string_list, list);
+       GList *list = g_list_first(string_list);
+
+       while(list) {
+               if( strcmp(str, (gchar *) list->data) ==  0 ) {
+                       g_free(list->data);
+                       list->data = NULL;
+                       return g_list_delete_link(string_list, list);
+               }
+               list = list->next;
        }
-      list = list->next;
-    }
-  return list;
+       return 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("retreived 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);
-       }
+       guint i;
+       mpdclient_filelist_t *filelist;
+
+       if ((filelist = mpdclient_filelist_get(c, path)) == NULL)
+               return list;
 
-      if( name )
-       list = g_list_append(list, name);
+       D("retrieved filelist!\n");
 
-      flist = flist->next;
-    }
-  mpdclient_filelist_free(filelist);
-  return list;
+       for (i = 0; i < filelist_length(filelist); ++i) {
+               struct filelist_entry *entry = filelist_get(filelist, i);
+               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);
+       }
+
+       filelist_free(filelist);
+       return list;
 }