Changeset 5781

Timestamp:

03/09/10 19:00:38 (3 years ago)

Author:

blogic

Message:

move lots of code around and rename some functions

Location:

luci2/cbi2

Files:

• cbi.c (modified) (13 diffs)
• cbi.h (modified) (2 diffs)
• cbi_core.c (added)
• cbi_dump.c (added)
• json.c (modified) (2 diffs)
• lucic.c (modified) (1 diff)
• Makefile (modified) (1 diff)
• parser.c (moved) (moved from luci2/cbi2/lucip.c) (1 diff)
• parser.h (moved) (moved from luci2/cbi2/lucip.h)
• source.c (modified) (1 diff)
• sources/uci.c (modified) (3 diffs)
• widget.c (modified) (2 diffs)
• widgets/luci/content.c (modified) (2 diffs)
• widgets/luci/field.c (modified) (2 diffs)
• widgets/luci/file.c (modified) (1 diff)
• widgets/luci/icon.c (modified) (2 diffs)
• widgets/luci/menu.c (modified) (4 diffs)

luci2/cbi2/cbi.c

@@ -18 +18 @@
 #include "json.h"
 
-struct cbi_property* cbi_parse_properties(struct blob_attr *prop)
+struct cbi_property* cbi_prop_parse(struct blob_attr *prop)
 {
     int rem = blob_len(prop);
@@ -38 +38 @@
 }
 
-void cbi_add_property(struct cbi_element *e, const char *name, const char *val, int generated)
+void cbi_prop_add(struct cbi_element *e, const char *name, const char *val, int generated)
 {
     struct cbi_property *p = malloc(sizeof(struct cbi_property));
@@ -49 +49 @@
 }
 
-const char* cbi_find_prop(struct cbi_element *e, const char *key)
+const char* cbi_prop_find(struct cbi_element *e, const char *key)
 {
     struct list_head *q;
@@ -62 +62 @@
 }
 
-int cbi_find_prop_int(struct cbi_element *e, char *key, int def)
-{
-    const char *c = cbi_find_prop(e, key);
+int cbi_prop_find_int(struct cbi_element *e, char *key, int def)
+{
+    const char *c = cbi_prop_find(e, key);
     if(c)
         return atoi(c);
@@ -76 +76 @@
         return;
     cbi_get_element_id(e->parent, buffer, file);
-    id = cbi_find_prop(e, "id");
+    id = cbi_prop_find(e, "id");
     if(!id && (CAPS(e) & CAP_DATA))
-        id = cbi_find_prop(e, "src");
+        id = cbi_prop_find(e, "src");
     if(!id)
         return;
@@ -90 +90 @@
     char tmp[128];
     char buffer[256];
-    const char *id = cbi_find_prop(e, "id");
+    const char *id = cbi_prop_find(e, "id");
     if(id)
         return;
@@ -97 +97 @@
     if(e->w)
         if(e->w->caps & CAP_DATA)
-            id = cbi_find_prop(e, "src");
+            id = cbi_prop_find(e, "src");
     if(!id)
-        id = cbi_find_prop(e, "name");
+        id = cbi_prop_find(e, "name");
     if(id)
     {
@@ -108 +108 @@
         if(*b == '@')
             b++;
-        cbi_add_property(e, "id", b, 1);
+        cbi_prop_add(e, "id", b, 1);
         return;
     }
@@ -114 +114 @@
     snprintf(tmp, 127, "%s%d", e->widget, *count);
     tmp[127] = '\0';
-    cbi_add_property(e, "id", tmp, 1);
+    cbi_prop_add(e, "id", tmp, 1);
     *buffer = 0;
     cbi_get_element_id(e->parent, buffer, 1);
@@ -140 +140 @@
     {
         struct cbi_element *e = container_of(p, struct cbi_element, list);
-        const char *id2 = cbi_find_prop(e, "id");
+        const char *id2 = cbi_prop_find(e, "id");
         if(id2)
         {
@@ -188 +188 @@
             break;
         case CBI_PROPERTY:
-            p = cbi_parse_properties(element);
+            p = cbi_prop_parse(element);
             list_add_tail(&p->list, &e->properties);
             break;
@@ -280 +280 @@
 }
 
-struct cbi_file* cbi_find_file(struct cbi_ctx *ctx, const char *name)
-{
-    struct list_head *p;
-
-    list_for_each(p, &ctx->files)
-    {
-        struct cbi_file *f = container_of(p, struct cbi_file, list);
-        if(!strcmp(f->file, name))
-            return f;
-    }
-    return 0;
-}
-
-static struct cbi_element* cbi_resolv_element(struct cbi_element *e, char *ref)
-{
-    char *tok;
-    struct cbi_element *next;
-    tok = strstr(ref, ".");
-    if(!tok)
-    {
-        const char *id = cbi_find_prop(e, "id");
-        if(!strcmp(id, ref))
-            return e;
-        else
-            return 0;
-    }
-    *tok = '\0';
-    tok++;
-    next = cbi_find_element(e, tok);
-    if(next)
-        return cbi_resolv_element(next, tok);
-    return 0;
-}
-
-struct cbi_element* cbi_resolv(struct cbi_ctx *ctx, const char *ref)
-{
-    struct cbi_element *ret = 0;
-    struct list_head *p;
-    list_for_each(p, &ctx->elements)
-    {
-        struct cbi_element *e2 = container_of(p, struct cbi_element, list);
-        char *buf = strdup(ref);
-        ret = cbi_resolv_element(e2, buf);
-        free(buf);
-        if(ret)
-            break;
-    }
-    return ret;
-}
-
-void cbi_index_verify(struct cbi_ctx *ctx, struct cbi_element *e)
-{
-    struct list_head *p;
-    if(e->w->caps & CAP_TEMPLATE)
-        return;
-    widget_verify(ctx, e);
-    if(e->broken)
-        return;
-    list_for_each(p, &e->elements)
-    {
-        struct cbi_element *e = container_of(p, struct cbi_element, list);
-        cbi_index_verify(ctx, e);
-    }
-}
-
-void cbi_index_add(struct cbi_ctx *ctx, struct cbi_file *f)
-{
-    struct list_head *p;
-    LOG("indexing %s\n", f->name);
-    list_for_each(p, &f->e->elements)
-    {
-        struct cbi_element *e = container_of(p, struct cbi_element, list);
-        cbi_index_verify(ctx, e);
-        if(CAPS(e) & CAP_PAGE)
-            list_add_tail(&e->index, &ctx->pages);
-        else if(CAPS(e) & (CAP_PACKAGE | CAP_SECTION) && !(CAPS(e) & CAP_TEMPLATE))
-            list_add_tail(&e->index, &ctx->globals);
-        else if(CAPS(e) & (CAP_MENU))
-            list_add_tail(&e->index, &ctx->menus);
-    }
-}
-
-void cbi_index(struct cbi_ctx *ctx)
-{
-    struct list_head *p;
-    list_for_each(p, &ctx->files)
-    {
-        struct cbi_file *f = container_of(p, struct cbi_file, list);
-        cbi_index_add(ctx, f);
-    }
-}
-
-void cbi_index_remove(struct cbi_file *f)
-{
-    struct list_head *p;
-    LOG("unindexing %s\n", f->name);
-    list_for_each(p, &f->e->elements)
-    {
-        struct cbi_element *e = container_of(p, struct cbi_element, list);
-        list_del(&e->index);
-    }
-}
-
 void cbi_free_property(struct cbi_property *prop)
 {
@@ -412 +309 @@
 }
 
-void cbi_free_file(struct cbi_ctx *ctx, struct cbi_file *file)
-{
-    struct list_head *p, *q;
-    cbi_index_remove(file);
-    LOG("dropping %s\n", file->name);
-    list_for_each_safe(p, q, &file->e->elements)
-    {
-        struct cbi_element *e = container_of(p, struct cbi_element, list);
-        cbi_free_element(e);
-    }
-    free(file->name);
-    free(file->file);
-    list_del(&file->list);
-    list_del(&file->e->list);
-    free(file);
-}
-
-void cbi_free_context(struct cbi_ctx *ctx)
-{
-    struct list_head *p, *q;
-    list_for_each_safe(p, q, &ctx->files)
-    {
-        struct cbi_file *f = container_of(p, struct cbi_file, list);
-        cbi_free_file(ctx, f);
-    }
-    free(ctx);
-}
-
-void cbi_index_flush(struct cbi_ctx *ctx)
-{
-    INIT_LIST_HEAD(&ctx->pages);
-    INIT_LIST_HEAD(&ctx->globals);
-    INIT_LIST_HEAD(&ctx->menus);
-}
-
-int cbi_add_file(struct cbi_ctx *ctx, char *filename, int index)
-{
-    struct stat st;
-    int fd, err, rem;
-    void *map = NULL;
-    struct cbi_file *f;
-    struct blob_attr *pos;
-    struct stat s;
-    int count = 0;
-    assert(ctx != NULL);
-    f = cbi_find_file(ctx, filename);
-    if(f)
-    {
-        if(!stat(filename, &s))
-        {
-            if(f->mtime == s.st_mtime)
-                return 0;
-            cbi_free_file(ctx, f);
-            f = 0;
-        }
-    }
-    LOG("loading %s\n", filename);
-    fd = open(filename, O_RDONLY);
-    if(fd < 0)
-        return fd;
-    err = fstat(fd, &st);
-    if (err < 0)
-        goto error;
-    err = -EINVAL;
-    if (st.st_size == 0)
-        goto error;
-    map = mmap(NULL, st.st_size, PROT_READ, MAP_FILE | MAP_PRIVATE, fd, 0);
-    if (map == MAP_FAILED)
-        goto error;
-    if (blob_pad_len(map) > st.st_size)
-        goto error;
-    err = -ENOMEM;
-    f = malloc(sizeof(struct cbi_file));
-    assert(f != NULL);
-    memset(f, 0, sizeof(struct cbi_file));
-    f->file = strdup(filename);
-    f->name = strdup(basename(filename));
-    f->name[strlen(f->name) - 5] = '\0';
-    f->mtime = st.st_mtime;
-    f->e = malloc(sizeof(struct cbi_element));
-    memset(f->e, 0, sizeof(struct cbi_element));
-    INIT_LIST_HEAD(&f->e->elements);
-    INIT_LIST_HEAD(&f->e->properties);
-    INIT_LIST_HEAD(&f->e->filters);
-    f->e->namespace = strdup(ctx->namespace);
-    f->e->widget = strdup("file");
-    f->e->w = widget_find(ctx->namespace, "file");
-    cbi_add_property(f->e, "src", f->name, 1);
-    cbi_add_property(f->e, "id", f->name, 1);
-    blob_for_each_attr(pos, map, rem)
-    {
-        struct cbi_element *e;
-        if(blob_id(pos) != CBI_ELEMENT)
-            continue;
-        e = cbi_parse_element(ctx, pos, &count, f->e);
-        if(e)
-            list_add_tail(&e->list, &f->e->elements);
-    }
-    list_add_tail(&f->e->list, &ctx->elements);
-    list_add_tail(&f->list, &ctx->files);
-    if(index)
-        cbi_index_add(ctx, f);
-    return 0;
-
-error:
-    return err;
-}
-
-static inline void print_spaces(int d)
-{
-    while(d--)
-        printf("\t");
-}
-
-void cbi_dump_element(struct cbi_element *e, int depth)
-{
-    struct list_head *p;
-    char nl = (!list_empty(&e->elements))?('\n'):('\0');
-    if(e->broken)
-        return;
-    if(e->w->caps & CAP_TEMPLATE)
-        return;
-    print_spaces(depth);
-    printf("<%s:%s", e->namespace, e->widget);
-    list_for_each(p, &e->properties)
-    {
-        struct cbi_property *q = container_of(p, struct cbi_property, list);
-        printf(" %s=\"%s\"", q->key, q->value);
-    }
-    if(!nl && !e->value)
-        printf("/");
-    printf(">%c", nl);
-    if(e->value)
-    {
-        if(nl)
-            print_spaces(depth + 1);
-        printf("%s%c", e->value, nl);
-    }
-    list_for_each(p, &e->elements)
-    {
-        struct cbi_element *e = container_of(p, struct cbi_element, list);
-        cbi_dump_element(e, depth + 1);
-    }
-    if(nl)
-        print_spaces(depth);
-    if(nl || e->value)
-        printf("</%s:%s>\n", e->namespace, e->widget);
-    else
-        printf("\n");
-}
-
-void cbi_dump_list(struct list_head *h)
-{
-    struct list_head *p;
-    list_for_each(p, h)
-    {
-        struct cbi_element *e = container_of(p, struct cbi_element, index);
-        const char *id = cbi_find_prop(e, "id");
-        if(id)
-            printf("%s -> %s\n", e->widget, id);
-    }
-}
-
-void cbi_dump(struct cbi_ctx *ctx)
-{
-    struct list_head *p;
-
-    list_for_each(p, &ctx->elements)
-    {
-        struct cbi_element *e = container_of(p, struct cbi_element, list);
-        cbi_dump_element(e, 0);
-    }
-    printf("pages:\n");
-    cbi_dump_list(&ctx->pages);
-    printf("globals:\n");
-    cbi_dump_list(&ctx->globals);
-    printf("menus:\n");
-    cbi_dump_list(&ctx->menus);
-}
-
-const char* cbi_virt_path(struct cbi_ctx *ctx, const char *path, const char *file)
-{
-    static char buf[256];
-    buf[255] = '\0';
-    snprintf(buf, 255, "%s%s%s", (ctx->vroot)?(ctx->vroot):(""), path, (file)?(file):(""));
-    return buf;
-}
-
-struct cbi_ctx* cbi_load_files(struct cbi_ctx *ctx)
-{
-    glob_t gl;
-    int gl_flags = GLOB_NOESCAPE | GLOB_NOSORT | GLOB_MARK;
-    if(glob(cbi_virt_path(ctx, ctx->path, "*.lucio"), gl_flags, NULL, &gl) >= 0)
-    {
-        int i;
-        for(i = 0; i < gl.gl_pathc; i++)
-            cbi_add_file(ctx, gl.gl_pathv[i], 0);
-        globfree(&gl);
-    }
-    return ctx;
-}
-
-void cbi_check_old_files(struct cbi_ctx *ctx)
-{
-    struct list_head *p, *q;
-
-    list_for_each_safe(p, q, &ctx->files)
-    {
-        struct cbi_file *f = container_of(p, struct cbi_file, list);
-        struct stat s;
-        if(stat(f->file, &s))
-            cbi_free_file(ctx, f);
-    }
-}
-
-void cbi_check_new_files(struct cbi_ctx *ctx)
-{
-    glob_t gl;
-    int gl_flags = GLOB_NOESCAPE | GLOB_NOSORT | GLOB_MARK;
-    if(glob(cbi_virt_path(ctx, ctx->path, "*.luco"), gl_flags, NULL, &gl) >= 0)
-    {
-        int i;
-        for(i = 0; i < gl.gl_pathc; i++)
-            cbi_add_file(ctx, gl.gl_pathv[i], 1);
-        globfree(&gl);
-    }
-}
-
-void cbi_check_new_files_src(struct cbi_ctx *ctx)
-{
-    glob_t gl;
-    int gl_flags = GLOB_NOESCAPE | GLOB_NOSORT | GLOB_MARK;
-    if(glob(cbi_virt_path(ctx, ctx->path, "*.luci"), gl_flags, NULL, &gl) >= 0)
-    {
-        int i;
-        for(i = 0; i < gl.gl_pathc; i++)
-        {
-            char *out = strdup(gl.gl_pathv[i]);
-            out[strlen(out) - 1] = 'o';
-            LOG("compiling %s -> %s\n", gl.gl_pathv[i], out);
-            if(!lucic_main(gl.gl_pathv[i], out))
-            {
-                LOG("deleting %s\n", gl.gl_pathv[i]);
-                unlink(gl.gl_pathv[i]);
-            } else {
-                LOG("failed\n");
-            }
-        }
-        globfree(&gl);
-    }
-}
-
-void cbi_reindex(struct cbi_ctx *ctx)
-{
-    cbi_check_old_files(ctx);
-    cbi_check_new_files_src(ctx);
-    cbi_check_new_files(ctx);
-}
-
-struct cbi_ctx* cbi_alloc_ctx(void)
-{
-    struct cbi_ctx *ctx = malloc(sizeof(struct cbi_ctx));
-
-    assert(ctx != NULL);
-    memset(ctx, 0, sizeof(struct cbi_ctx));
-    INIT_LIST_HEAD(&ctx->files);
-    INIT_LIST_HEAD(&ctx->pages);
-    INIT_LIST_HEAD(&ctx->globals);
-    INIT_LIST_HEAD(&ctx->menus);
-    INIT_LIST_HEAD(&ctx->elements);
-
-    return ctx;
-}
-
-int cbi_dump_blob(char *file)
-{
-    struct cbi_ctx *ctx = cbi_alloc_ctx();
-    cbi_add_file(ctx, file, 0);
-    cbi_index(ctx);
-    cbi_dump(ctx);
-    cbi_free_context(ctx);
-    return 0;
-}
-
-struct cbi_ctx* cbi_init(const char *vroot, const char *path, const char *namespace)
-{
-    struct cbi_ctx *ctx = cbi_alloc_ctx();
-    ctx->path = strdup((path)?(path):("/lib/luci2/"));
-    ctx->namespace = strdup((namespace)?(namespace):("luci"));
-    if(vroot)
-        ctx->vroot = strdup(vroot);
-    validate_init(ctx);
-    cbi_load_files(ctx);
-    cbi_index(ctx);
-    cbi_reindex(ctx);
-    return ctx;
-}
-
-void cbi_request(struct cbi_ctx *ctx, char *request)
-{
-    json_object *out, *in = json_tokener_parse(request);
-    if(is_error(in))
-    {
-        printf("bad json\n");
-        return;
-    }
-    out = json_request(ctx, in);
-    if(out)
-    {
-        printf("res -> %s\n", json_object_to_json_string(out));
-        json_object_put(out);
-    }
-    json_object_put(in);
-}
+

luci2/cbi2/cbi.h

@@ -150 +150 @@
 };
 
+struct cbi_ctx* cbi_alloc_ctx(void);
+int cbi_add_file(struct cbi_ctx *ctx, char *filename, int index);
+void cbi_free_element(struct cbi_element *element);
+struct cbi_element* cbi_find_element(struct cbi_element *e, const char *id);
+struct cbi_element* cbi_parse_element(struct cbi_ctx *ctx, struct blob_attr *attr, int *count, struct cbi_element *parent);
+
+void cbi_index(struct cbi_ctx *ctx);
 struct cbi_ctx* cbi_init(const char *vroot, const char *path, const char *namespace);
 void cbi_dump(struct cbi_ctx *ctx);
@@ -155 +162 @@
 void cbi_reindex(struct cbi_ctx *ctx);
 void cbi_gen_default_id(struct cbi_element *e, int *count);
-const char* cbi_find_prop(struct cbi_element *e, const char *key);
+
+const char* cbi_prop_find(struct cbi_element *e, const char *key);
+void cbi_prop_add(struct cbi_element *e, const char *name, const char *val, int generated);
+
 void cbi_add_property(struct cbi_element *e, const char *name, const char *val, int generated);
 void cbi_get_element_id(struct cbi_element *e, char *buffer, int file);

luci2/cbi2/json.c

@@ -8 +8 @@
     struct list_head *p;
     json_object *j = 0;
-    const char *id = cbi_find_prop(e, "id");
+    const char *id = cbi_prop_find(e, "id");
     int descend = 1;
     int container = ((CAPS(e) & CAP_CONTAINER) && (e->source));
@@ -51 +51 @@
     if(!container)
     {
-        id = cbi_find_prop(e, "id");
+        id = cbi_prop_find(e, "id");
         json_object_object_add(q, id, j);
     }

luci2/cbi2/lucic.c

@@ -8 +8 @@
 #include <fcntl.h>
 
-#include "lucip.h"
+#include "parser.h"
 #include "lucic.h"
 

luci2/cbi2/Makefile

@@ -8 +8 @@
 all: $(BINARY)
 
-luci: luci.c lucic.c lucip.c uci.c json.c cbi.c source.c session.c u_sock.c validate.c uvl.c lang.c blob.c widget.c log.c handler.c validator/*.c widgets/luci/*.c sources/*.c liblmo.a
+luci: luci.c lucic.c parser.c uci.c json.c cbi.c cbi_dump.c cbi_core.c source.c session.c u_sock.c validate.c uvl.c lang.c blob.c widget.c log.c handler.c validator/*.c widgets/luci/*.c sources/*.c liblmo.a
     $(CC) $(CFLAGS) -o $@ $^ -luci -ljson -lcrypt 
 

luci2/cbi2/parser.c

@@ -9 +9 @@
 #include <ctype.h>
 
-#include "lucip.h"
+#include "parser.h"
 #include "cbi.h"
 

luci2/cbi2/source.c

@@ -47 +47 @@
 static int source_detemine(struct cbi_element *e)
 {
-    const char *src = cbi_find_prop(e, "src");
+    const char *src = cbi_prop_find(e, "src");
     if((CAPS(e) & CAP_DEPENDENCY) && !src)
         return 0;

luci2/cbi2/sources/uci.c

@@ -149 +149 @@
 {
     struct uci_src_priv *p = malloc(sizeof(struct uci_src_priv));
-    const char *src = cbi_find_prop(e, "src");
+    const char *src = cbi_prop_find(e, "src");
     const char *dot1 = 0, *dot2 = 0, *tmp = src;
     int use_parent = 0;
@@ -303 +303 @@
         value = uvalue = ucix_get_option(ucictx, p->package, p->section, p->option);
         if(!value)
-            value = cbi_find_prop(e, "default");
+            value = cbi_prop_find(e, "default");
         if(value)
             json_object_object_add(j, "value", json_object_new_string(value));
@@ -370 +370 @@
     if((CAPS(e) & CAP_DEPENDENCY) != CAP_DEPENDENCY)
         return 1;
-    value = cbi_find_prop(e, "value");
+    value = cbi_prop_find(e, "value");
     if(!p->package || !p->section || !p->option || !value)
     {

luci2/cbi2/widget.c

@@ -49 +49 @@
     {
         if(e->w->props[i].type == PROP_REQUIRED)
-            if(!cbi_find_prop(e, e->w->props[i].name))
+            if(!cbi_prop_find(e, e->w->props[i].name))
             {
                 CBILOG(e, "missing required property %s\n", e->w->props[i].name);
@@ -98 +98 @@
 static int widget_abstract(struct cbi_ctx *ctx, struct cbi_element *e)
 {
-    const char *ref = cbi_find_prop(e, "ref");
+    const char *ref = cbi_prop_find(e, "ref");
     struct cbi_element *r;
     if(!ref)

luci2/cbi2/widgets/luci/content.c

@@ -9 +9 @@
 {
     json_object *j = json_object_new_object();
-    const char *css = cbi_find_prop(e, "css");
+    const char *css = cbi_prop_find(e, "css");
     json_object_object_add(j, "type", json_object_new_string("text"));
     if(css)
@@ -36 +36 @@
 {
     content_init(ctx, e);
-    cbi_add_property(e, "css", "title", 1);
+    cbi_prop_add(e, "css", "title", 1);
     return 0;
 }

luci2/cbi2/widgets/luci/field.c

@@ -3 +3 @@
 int field_init(struct cbi_ctx *ctx, struct cbi_element *e)
 {
-    const char *type = cbi_find_prop(e, "type");
+    const char *type = cbi_prop_find(e, "type");
     if(!type)
-        cbi_add_property(e, "type", "string", 1);
-    type = cbi_find_prop(e, "type");
+        cbi_prop_add(e, "type", "string", 1);
+    type = cbi_prop_find(e, "type");
     if(!(e->validate = validator_find(type)))
     {
@@ -25 +25 @@
 {
     json_object *j = json_object_new_object();
-    const char *type = cbi_find_prop(e, "type");
-    const char *def = cbi_find_prop(e, "default");
+    const char *type = cbi_prop_find(e, "type");
+    const char *def = cbi_prop_find(e, "default");
     json_object_object_add(j, "type", json_object_new_string((type)?(type):("string")));
     if(def)

luci2/cbi2/widgets/luci/file.c

@@ -4 +4 @@
 {
     json_object *j = json_object_new_object();
-    const char *type = cbi_find_prop(e, "type");
+    const char *type = cbi_prop_find(e, "type");
     json_object_object_add(j, "type", json_object_new_string((type)?(type):("package")));
     return j;

luci2/cbi2/widgets/luci/icon.c

@@ -3 +3 @@
 int icon_init(struct cbi_ctx *ctx, struct cbi_element *e)
 {
-    const char *handler = cbi_find_prop(e, "handler");
-    const char *link = cbi_find_prop(e, "link");
-    const char *ref = cbi_find_prop(e, "ref");
+    const char *handler = cbi_prop_find(e, "handler");
+    const char *link = cbi_prop_find(e, "link");
+    const char *ref = cbi_prop_find(e, "ref");
     if(!handler && !link && !ref)
     {
@@ -27 +27 @@
 {
     json_object *j = json_object_new_object();
-    const char *link = cbi_find_prop(e, "link");
-    const char *ref = cbi_find_prop(e, "ref");
-    const char *confirm = cbi_find_prop(e, "confirm");
-    const char *icon = cbi_find_prop(e, "icon");
+    const char *link = cbi_prop_find(e, "link");
+    const char *ref = cbi_prop_find(e, "ref");
+    const char *confirm = cbi_prop_find(e, "confirm");
+    const char *icon = cbi_prop_find(e, "icon");
     json_object_object_add(j, "type", json_object_new_string("icon"));
     if(link)

luci2/cbi2/widgets/luci/menu.c

@@ -10 +10 @@
 int menu_init(struct cbi_ctx *ctx, struct cbi_element *e)
 {
-    const char *tag = cbi_find_prop(e, "name");
+    const char *tag = cbi_prop_find(e, "name");
     if(!tag)
-        tag = cbi_find_prop(e, "id");
+        tag = cbi_prop_find(e, "id");
     e->lmo = sfh_hash(tag, strlen(tag));
     return 0;
@@ -20 +20 @@
 {
     json_object *j = json_object_new_object();
-    const char *icon = cbi_find_prop(e, "icon");
-    const char *name = cbi_find_prop(e, "name");
+    const char *icon = cbi_prop_find(e, "icon");
+    const char *name = cbi_prop_find(e, "name");
     json_object_object_add(j, "type", json_object_new_string("menu"));
     json_object_object_add(j, "icon", json_object_new_string((icon)?(icon):("default")));
@@ -27 +27 @@
         json_object_object_add(j, "caption", json_object_new_string(lmo_translate_key(ctx, e->lmo, name)));
     else
-        json_object_object_add(j, "caption", json_object_new_string(lmo_translate_key(ctx, e->lmo, cbi_find_prop(e, "id"))));
+        json_object_object_add(j, "caption", json_object_new_string(lmo_translate_key(ctx, e->lmo, cbi_prop_find(e, "id"))));
     return j;
 }
@@ -61 +61 @@
 {
     json_object *j = json_object_new_object();
-    const char *icon = cbi_find_prop(e, "icon");
-    const char *page = cbi_find_prop(e, "page");
+    const char *icon = cbi_prop_find(e, "icon");
+    const char *page = cbi_prop_find(e, "page");
     json_object_object_add(j, "type", json_object_new_string("entry"));
     json_object_object_add(j, "page", json_object_new_string(page));