move get_filename as well

[project/uci.git] / list.c

diff --git a/list.c b/list.c
index 72d2eff..066a9fd 100644 (file)
--- a/list.c
+++ b/list.c
@@ -22,19 +22,19 @@ static inline void uci_list_init(struct uci_list *ptr)
 }
 
 /* inserts a new list entry between two consecutive entries */
-static inline void __uci_list_add(struct uci_list *prev, struct uci_list *next, struct uci_list *ptr)
+static inline void uci_list_insert(struct uci_list *list, struct uci_list *ptr)
 {
-       next->prev = ptr;
-       ptr->prev = prev;
-       ptr->next = next;
-       prev->next = ptr;
+       list->next->prev = ptr;
+       ptr->prev = list;
+       ptr->next = list->next;
+       list->next = ptr;
 }
 
 /* inserts a new list entry at the tail of the list */
 static inline void uci_list_add(struct uci_list *head, struct uci_list *ptr)
 {
        /* NB: head->prev points at the tail */
-       __uci_list_add(head->prev, head, ptr);
+       uci_list_insert(head->prev, ptr);
 }
 
 static inline void uci_list_del(struct uci_list *ptr)
@@ -215,56 +215,4 @@ found:
        return 0;
 }
 
-static inline char *get_filename(char *path)
-{
-       char *p;
-
-       p = strrchr(path, '/');
-       p++;
-       if (!*p)
-               return NULL;
-       return p;
-}
-
-char **uci_list_configs(struct uci_context *ctx)
-{
-       char **configs;
-       glob_t globbuf;
-       int size, i;
-       char *buf;
-
-       if (glob(UCI_CONFDIR "/*", GLOB_MARK, NULL, &globbuf) != 0)
-               return NULL;
-
-       size = sizeof(char *) * (globbuf.gl_pathc + 1);
-       for(i = 0; i < globbuf.gl_pathc; i++) {
-               char *p;
-
-               p = get_filename(globbuf.gl_pathv[i]);
-               if (!p)
-                       continue;
-
-               size += strlen(p) + 1;
-       }
-
-       configs = malloc(size);
-       if (!configs)
-               return NULL;
-
-       memset(configs, 0, size);
-       buf = (char *) &configs[globbuf.gl_pathc + 1];
-       for(i = 0; i < globbuf.gl_pathc; i++) {
-               char *p;
-
-               p = get_filename(globbuf.gl_pathv[i]);
-               if (!p)
-                       continue;
-
-               configs[i] = buf;
-               strcpy(buf, p);
-               buf += strlen(buf) + 1;
-       }
-       return configs;
-}
-