diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-10-29 16:50:47 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-10-29 16:50:47 +0100 |
| commit | 84492e759af9d15ddea24301431ef00d028b3fd3 (patch) | |
| tree | 775b9373597a0f0f1ee2756df72119436d06ffca | |
| parent | be457b5263f1f0504e50c241c18e21bb340cef7e (diff) | |
| download | uci-84492e759af9d15ddea24301431ef00d028b3fd3.tar.gz | |
ucimap: get rid of duplicate initialization warnings
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
| -rw-r--r-- | ucimap-example.c | 5 | ||||
| -rw-r--r-- | ucimap.h | 11 |
2 files changed, 5 insertions, 11 deletions
diff --git a/ucimap-example.c b/ucimap-example.c index 18c3c1f..6f06451 100644 --- a/ucimap-example.c +++ b/ucimap-example.c @@ -151,7 +151,6 @@ static struct my_optmap network_interface_options[] = { .map = { UCIMAP_OPTION(struct uci_network, proto), .type = UCIMAP_STRING, - .name = "proto", .data.s.maxlen = 32, } }, @@ -159,14 +158,12 @@ static struct my_optmap network_interface_options[] = { .map = { UCIMAP_OPTION(struct uci_network, ifname), .type = UCIMAP_STRING, - .name = "ifname" } }, { .map = { UCIMAP_OPTION(struct uci_network, ipaddr), .type = UCIMAP_CUSTOM, - .name = "ipaddr", .parse = network_parse_ip, .format = network_format_ip, .free = network_free_ip, @@ -176,14 +173,12 @@ static struct my_optmap network_interface_options[] = { .map = { UCIMAP_OPTION(struct uci_network, enabled), .type = UCIMAP_BOOL, - .name = "enabled", } }, { .map = { UCIMAP_OPTION(struct uci_network, test), .type = UCIMAP_INT, - .name = "test" } }, { @@ -93,7 +93,6 @@ #endif /* __GNUC__ */ #define UCIMAP_OPTION(_type, _field) \ - .type = UCIMAP_CUSTOM, \ .name = #_field, \ .offset = offsetof(_type, _field), \ .detected_type = __optmap_gen_type(_type, _field), \ @@ -135,11 +134,11 @@ enum ucimap_type { UCIMAP_TYPE = 0xf0, /* type mask */ /* subtypes */ - UCIMAP_STRING = 0x0, - UCIMAP_BOOL = 0x1, - UCIMAP_INT = 0x2, - UCIMAP_SECTION = 0x3, - UCIMAP_CUSTOM = 0x4, + UCIMAP_CUSTOM = 0x0, + UCIMAP_STRING = 0x1, + UCIMAP_BOOL = 0x2, + UCIMAP_INT = 0x3, + UCIMAP_SECTION = 0x4, UCIMAP_SUBTYPE = 0xf, /* subtype mask */ /* automatically create lists from |