shorten callback names

[uci.git] / ucimap.h

diff --git a/ucimap.h b/ucimap.h
index 94095009aed5066f8c4f40a331555e8c277fc35d..865c45a266ede6524d8eba05de04a0ab1b53e25c 100644 (file)
--- a/ucimap.h
+++ b/ucimap.h
@@ -32,13 +32,9 @@
 #define TEST_BIT(_name, _bit) \
        (_name[(_bit) / 8] & (1 << ((_bit) % 8)))
 
-#define OPTMAP_OPTION(_maptype, _type, _field, ...) \
-       { \
-               .type = _maptype, \
-               .name = #_field, \
-               .offset = offsetof(_type, _field), \
-               __VA_ARGS__  \
-       }
+#define UCIMAP_OPTION(_type, _field) \
+       .name = #_field, \
+       .offset = offsetof(_type, _field)
 
 struct uci_sectmap;
 struct uci_optmap;
@@ -88,13 +84,13 @@ struct uci_sectmap {
        unsigned int alloc_len;
 
        /* give the caller time to initialize the preallocated struct */
-       int (*init_section)(struct uci_map *map, void *section, struct uci_section *s);
+       int (*init)(struct uci_map *map, void *section, struct uci_section *s);
 
        /* pass the fully processed struct to the callback after the section end */
-       int (*add_section)(struct uci_map *map, void *section);
+       int (*add)(struct uci_map *map, void *section);
 
        /* let the callback clean up its own stuff in the section */
-       int (*free_section)(struct uci_map *map, void *section);
+       int (*free)(struct uci_map *map, void *section);
 
        /* list of option mappings for this section */
        struct uci_optmap *options;