X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=list.c;h=059106191de3c013d6dc850ec5b1ccd3508a70bb;hp=666989af8e56b2091196d7973051504ccd08704a;hb=e6279f87129e65c469a29d606a4b6afd7b7207b8;hpb=c9125084e1e28b8f1907b2ca5c5f9d69a538425f diff --git a/list.c b/list.c index 666989a..0591061 100644 --- a/list.c +++ b/list.c @@ -69,9 +69,6 @@ uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size) static void uci_free_element(struct uci_element *e) { - if (!e) - return; - if (!uci_list_empty(&e->list)) uci_list_del(&e->list); free(e); @@ -215,56 +212,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; -} -