projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ucimap: simplify the parse/format callbacks. the data argument now always points...
[project/uci.git]
/
ucimap.c
diff --git
a/ucimap.c
b/ucimap.c
index
99b8829
..
52c920b
100644
(file)
--- 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:
ucimap_add_fixup(sd, data, om, str);
return;
case UCIMAP_CUSTOM:
- tdata.s = (char *) data;
break;
}
if (om->parse) {
break;
}
if (om->parse) {
- if (om->parse(ucimap_section_ptr(sd), om,
&t
data, 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)
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) {
}
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;
if (om->format(ucimap_section_ptr(sd), om, data, &str) < 0)
return NULL;