Changeset 5709

Timestamp:

03/01/10 03:34:52 (3 years ago)

Author:

blogic

Message:

cleanup widgets

Location:

luci2/cbi2

Files:

• cbi.c (modified) (1 diff)
• widgets/file.c (modified) (2 diffs)
• widgets/foreach.c (modified) (2 diffs)
• widgets/form.c (modified) (2 diffs)
• widgets/option.c (modified) (1 diff)
• widgets/package.c (modified) (2 diffs)
• widgets/page.c (modified) (2 diffs)
• widgets/section.c (modified) (2 diffs)
• widgets/tsection.c (modified) (2 diffs)

luci2/cbi2/cbi.c

@@ -170 +170 @@
     if(widget_find_prop(e->w, "id"))
         cbi_gen_default_id(e, count);
-    if(e->w->init(ctx, e))
-        return 1;
+    if(e->w->init)
+        if(e->w->init(ctx, e))
+            return 1;
     return 0;
 }

luci2/cbi2/widgets/file.c

@@ -1 +1 @@
 #include "../cbi.h"
-
-int file_init(struct cbi_ctx *ctx, struct cbi_element *e)
-{
-    return 0;
-}
 
 json_object* file_json(struct cbi_ctx *ctx, struct cbi_element *e)
@@ -21 +16 @@
 struct cbi_widget file = {
     .caps = CAP_DATA | CAP_PACKAGE,
-    .init = file_init,
     .json = file_json,
     WPROPS(file_props),

luci2/cbi2/widgets/foreach.c

@@ -1 +1 @@
 #include "../cbi.h"
-
-int foreach_init(struct cbi_ctx *ctx, struct cbi_element *e)
-{
-    return 0;
-}
 
 struct cbi_widget_property foreach_props[] = {
@@ -15 +10 @@
     .caps = CAP_DATA | CAP_PACKAGE | CAP_SECTION | CAP_ITERATE,
     .parent_caps = CAP_SECTION,
-    .init = foreach_init,
     WPROPS(foreach_props),
 };

luci2/cbi2/widgets/form.c

@@ -1 +1 @@
 #include "../cbi.h"
-
-int form_init(struct cbi_ctx *ctx, struct cbi_element *e)
-{
-    return 0;
-}
 
 json_object* form_json(struct cbi_ctx *ctx, struct cbi_element *e)
@@ -19 +14 @@
 struct cbi_widget form = {
     .caps = CAP_PACKAGE | CAP_SECTION,
-    .init = form_init,
     .json = form_json,
     WPROPS(form_props),

luci2/cbi2/widgets/option.c

@@ -7 +7 @@
 };
 
-int option_init(struct cbi_ctx *ctx, struct cbi_element *e)
-{
-    return 0;
-}
-
 struct cbi_widget option = {
     .caps = CAP_DATA | CAP_OPTION,
     .parent_caps = CAP_SECTION,
-    .init = option_init,
     WPROPS(option_props),
 };

luci2/cbi2/widgets/package.c

@@ -1 +1 @@
 #include "../cbi.h"
-
-int package_init(struct cbi_ctx *ctx, struct cbi_element *e)
-{
-    return 0;
-}
 
 struct cbi_widget_property package_props[] = {
@@ -13 +8 @@
 struct cbi_widget package = {
     .caps = CAP_DATA | CAP_PAGE | CAP_PACKAGE,
-    .init = package_init,
     WPROPS(package_props),
 };

luci2/cbi2/widgets/page.c

@@ -1 +1 @@
 #include "../cbi.h"
-
-int page_init(struct cbi_ctx *ctx, struct cbi_element *e)
-{
-    return 0;
-}
 
 json_object* page_json(struct cbi_ctx *ctx, struct cbi_element *e)
@@ -19 +14 @@
 struct cbi_widget page = {
     .caps = CAP_PAGE | CAP_PACKAGE,
-    .init = page_init,
     .json = page_json,
     WPROPS(page_props),

luci2/cbi2/widgets/section.c

@@ -1 +1 @@
 #include "../cbi.h"
-
-int section_init(struct cbi_ctx *ctx, struct cbi_element *e)
-{
-    return 0;
-}
 
 struct cbi_widget_property section_props[] = {
@@ -15 +10 @@
     .caps = CAP_DATA | CAP_PACKAGE | CAP_SECTION,
     .parent_caps = CAP_PACKAGE,
-    .init = section_init,
     WPROPS(section_props),
 };

luci2/cbi2/widgets/tsection.c

@@ -1 +1 @@
 #include "../cbi.h"
-
-int tsection_init(struct cbi_ctx *ctx, struct cbi_element *e)
-{
-    return 0;
-}
 
 struct cbi_widget_property tsection_props[] = {
@@ -14 +9 @@
     .caps = CAP_SECTION | CAP_TEMPLATE,
     .parent_caps = CAP_PACKAGE,
-    .init = tsection_init,
     WPROPS(tsection_props),
 };