X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=uci.h;h=a5eb7f153ebc79bd600df47b210198b53751024f;hb=825be5d0cd699919fbad15901c63044f0efffe82;hp=1b2fd63eaa1f8f5780a31e24d0f875b792ab5af0;hpb=cb9a05e41a9d0ba3c54e4efdff98333b33b9ca9d;p=project%2Fuci.git diff --git a/uci.h b/uci.h index 1b2fd63..a5eb7f1 100644 --- a/uci.h +++ b/uci.h @@ -15,6 +15,10 @@ #ifndef __LIBUCI_H #define __LIBUCI_H +#ifdef __cplusplus +extern "C" { +#endif + #include "uci_config.h" /* @@ -29,6 +33,7 @@ #include #include #include +#include #define UCI_CONFDIR "/etc/config" #define UCI_SAVEDIR "/tmp/.uci" @@ -65,6 +70,7 @@ struct uci_option; struct uci_delta; struct uci_context; struct uci_backend; +struct uci_parse_option; struct uci_parse_context; @@ -344,6 +350,23 @@ int uci_parse_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str); */ int uci_lookup_next(struct uci_context *ctx, struct uci_element **e, struct uci_list *list, const char *name); +/** + * uci_parse_section: look up a set of options + * @s: uci section + * @opts: list of options to look up + * @n_opts: number of options to look up + * @tb: array of pointers to found options + */ +void uci_parse_section(struct uci_section *s, const struct uci_parse_option *opts, + int n_opts, struct uci_option **tb); + +/** + * uci_hash_options: build a hash over a list of options + * @tb: list of option pointers + * @n_opts: number of options + */ +uint32_t uci_hash_options(struct uci_option **tb, int n_opts); + /* UCI data structures */ enum uci_type { @@ -521,6 +544,11 @@ struct uci_plugin void *dlh; }; +struct uci_parse_option { + const char *name; + enum uci_option_type type; +}; + /* linked list handling */ #ifndef offsetof @@ -698,4 +726,20 @@ uci_lookup_option(struct uci_context *ctx, struct uci_section *s, const char *na return NULL; } +static inline const char * +uci_lookup_option_string(struct uci_context *ctx, struct uci_section *s, const char *name) +{ + struct uci_option *o; + + o = uci_lookup_option(ctx, s, name); + if (!o || o->type != UCI_TYPE_STRING) + return NULL; + + return o->v.string; +} + +#ifdef __cplusplus +} +#endif + #endif