X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=uci.h;h=36c8890dba0ce9fe86cf4eac8bc43f366720c927;hp=68b53f5ecc36e79e0fafbb97ad74e5d6dc31ed5e;hb=42429219a90d697d88c5203bddef34c31e552643;hpb=ec8cbbbe0f20e67cbd3bd471b9ac55ceacaef7b8 diff --git a/uci.h b/uci.h index 68b53f5..36c8890 100644 --- a/uci.h +++ b/uci.h @@ -61,8 +61,6 @@ struct uci_list }; struct uci_ptr; -struct uci_plugin; -struct uci_hook_ops; struct uci_element; struct uci_package; struct uci_section; @@ -301,42 +299,6 @@ extern int uci_set_backend(struct uci_context *ctx, const char *name); */ extern bool uci_validate_text(const char *str); - -/** - * uci_add_hook: add a uci hook - * @ctx: uci context - * @ops: uci hook ops - * - * NB: allocated and freed by the caller - */ -extern int uci_add_hook(struct uci_context *ctx, const struct uci_hook_ops *ops); - -/** - * uci_remove_hook: remove a uci hook - * @ctx: uci context - * @ops: uci hook ops - */ -extern int uci_remove_hook(struct uci_context *ctx, const struct uci_hook_ops *ops); - -/** - * uci_load_plugin: load an uci plugin - * @ctx: uci context - * @filename: path to the uci plugin - * - * NB: plugin will be unloaded automatically when the context is freed - */ -int uci_load_plugin(struct uci_context *ctx, const char *filename); - -/** - * uci_load_plugins: load all uci plugins from a directory - * @ctx: uci context - * @pattern: pattern of uci plugin files (optional) - * - * if pattern is NULL, then uci_load_plugins will call uci_load_plugin - * for uci_*.so in /lib/ - */ -int uci_load_plugins(struct uci_context *ctx, const char *pattern); - /** * uci_parse_ptr: parse a uci string into a uci_ptr * @ctx: uci context @@ -387,7 +349,6 @@ enum uci_type { UCI_TYPE_BACKEND = 6, UCI_TYPE_ITEM = 7, UCI_TYPE_HOOK = 8, - UCI_TYPE_PLUGIN = 9, }; enum uci_option_type { @@ -449,9 +410,6 @@ struct uci_context bool internal, nested; char *buf; int bufsz; - - struct uci_list hooks; - struct uci_list plugins; }; struct uci_package @@ -528,31 +486,6 @@ struct uci_ptr const char *value; }; -struct uci_hook_ops -{ - void (*load)(const struct uci_hook_ops *ops, struct uci_package *p); - void (*set)(const struct uci_hook_ops *ops, struct uci_package *p, struct uci_delta *e); -}; - -struct uci_hook -{ - struct uci_element e; - const struct uci_hook_ops *ops; -}; - -struct uci_plugin_ops -{ - int (*attach)(struct uci_context *ctx); - void (*detach)(struct uci_context *ctx); -}; - -struct uci_plugin -{ - struct uci_element e; - const struct uci_plugin_ops *ops; - void *dlh; -}; - struct uci_parse_option { const char *name; enum uci_option_type type; @@ -628,8 +561,6 @@ struct uci_parse_option { #define uci_type_package UCI_TYPE_PACKAGE #define uci_type_section UCI_TYPE_SECTION #define uci_type_option UCI_TYPE_OPTION -#define uci_type_hook UCI_TYPE_HOOK -#define uci_type_plugin UCI_TYPE_PLUGIN /* element typecasting */ #ifdef UCI_DEBUG_TYPECAST @@ -639,8 +570,6 @@ static const char *uci_typestr[] = { [uci_type_package] = "package", [uci_type_section] = "section", [uci_type_option] = "option", - [uci_type_hook] = "hook", - [uci_type_plugin] = "plugin", }; static void uci_typecast_error(int from, int to) @@ -662,8 +591,6 @@ BUILD_CAST(delta) BUILD_CAST(package) BUILD_CAST(section) BUILD_CAST(option) -BUILD_CAST(hook) -BUILD_CAST(plugin) #else #define uci_to_backend(ptr) container_of(ptr, struct uci_backend, e) @@ -671,8 +598,6 @@ BUILD_CAST(plugin) #define uci_to_package(ptr) container_of(ptr, struct uci_package, e) #define uci_to_section(ptr) container_of(ptr, struct uci_section, e) #define uci_to_option(ptr) container_of(ptr, struct uci_option, e) -#define uci_to_hook(ptr) container_of(ptr, struct uci_hook, e) -#define uci_to_plugin(ptr) container_of(ptr, struct uci_plugin, e) #endif /**