X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=uci.h;h=ac85105443a0b5fac31c23baca7bd6dfd17f4e24;hp=0a2a662677b7c3561c004d74ad8ad2847e5c8332;hb=5faea6dcdf54d0ac085298b87c0799551bdcfdbd;hpb=5620bfaa14ce556b94de26128bc7fe9edc5a3f27 diff --git a/uci.h b/uci.h index 0a2a662..ac85105 100644 --- a/uci.h +++ b/uci.h @@ -63,6 +63,7 @@ struct uci_section; struct uci_option; struct uci_history; struct uci_context; +struct uci_backend; struct uci_parse_context; @@ -136,13 +137,6 @@ extern int uci_load(struct uci_context *ctx, const char *name, struct uci_packag extern int uci_unload(struct uci_context *ctx, struct uci_package *p); /** - * uci_cleanup: Clean up after an error - * - * @ctx: uci context - */ -extern int uci_cleanup(struct uci_context *ctx); - -/** * uci_lookup: Look up an uci element * * @ctx: uci context @@ -157,6 +151,15 @@ extern int uci_cleanup(struct uci_context *ctx); extern int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_package *package, char *section, char *option); /** + * uci_add_section: Add an unnamed section + * @ctx: uci context + * @p: package to add the section to + * @type: section type + * @res: pointer to store a reference to the new section in + */ +extern int uci_add_section(struct uci_context *ctx, struct uci_package *p, char *type, struct uci_section **res); + +/** * uci_set_element_value: Replace an element's value with a new one * @ctx: uci context * @element: pointer to an uci_element struct pointer @@ -225,6 +228,8 @@ extern int uci_commit(struct uci_context *ctx, struct uci_package **p, bool over /** * uci_list_configs: List available uci config files * @ctx: uci context + * + * caller is responsible for freeing the allocated memory behind list */ extern int uci_list_configs(struct uci_context *ctx, char ***list); @@ -293,6 +298,15 @@ struct uci_element char *name; }; +struct uci_backend +{ + const char *name; + char **(*list_configs)(struct uci_context *ctx); + struct uci_package *(*load)(struct uci_context *ctx, const char *name); + void (*commit)(struct uci_context *ctx, struct uci_package **p, bool overwrite); +}; + + struct uci_context { /* list of config packages */ @@ -301,6 +315,9 @@ struct uci_context /* parser context, use for error handling only */ struct uci_parse_context *pctx; + /* backend for import and export */ + struct uci_backend *backend; + /* uci runtime flags */ enum uci_flags flags; @@ -324,10 +341,11 @@ struct uci_package struct uci_element e; struct uci_list sections; struct uci_context *ctx; - bool confdir; + bool has_history; char *path; /* private: */ + struct uci_backend *backend; int n_section; struct uci_list history; struct uci_list saved_history; @@ -384,9 +402,6 @@ struct uci_history * @_type: config, section or option * @_ptr: pointer to the uci_list struct */ -#define element_to(type, ptr) \ - container_of(ptr, struct uci_ ## type, e) - #define list_to_element(ptr) \ container_of(ptr, struct uci_element, list)