X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=ucimap.c;fp=ucimap.c;h=52c920b39323a88f0906b8f14fd59c2015cadd98;hp=99b8829e194dab82a470a7f4f1badf49a5901394;hb=97e71a1c1b0a9d50f2dc334e72c89153f8b87d45;hpb=c434442c9e5467fa428f888591f238d0d2d0908c diff --git a/ucimap.c b/ucimap.c index 99b8829..52c920b 100644 --- a/ucimap.c +++ b/ucimap.c @@ -404,11 +404,10 @@ ucimap_add_value(union ucimap_data *data, struct uci_optmap *om, struct ucimap_s ucimap_add_fixup(sd, data, om, str); return; case UCIMAP_CUSTOM: - tdata.s = (char *) data; break; } if (om->parse) { - if (om->parse(ucimap_section_ptr(sd), om, &tdata, str) < 0) + if (om->parse(ucimap_section_ptr(sd), om, data, str) < 0) return; if (ucimap_is_custom(om->type) && om->free) { if (tdata.ptr != data->ptr) @@ -795,13 +794,6 @@ ucimap_data_to_string(struct ucimap_section_data *sd, struct uci_optmap *om, uni } if (om->format) { - union ucimap_data tdata; - - if (ucimap_is_custom(om->type)) { - tdata.s = (char *)data; - data = &tdata; - } - if (om->format(ucimap_section_ptr(sd), om, data, &str) < 0) return NULL;