delta: use a table for converting between UCI_CMD_XXX and prefixes.

[project/uci.git] / uci.h

diff --git a/uci.h b/uci.h
index a5eb7f1..b31d007 100644 (file)
--- a/uci.h
+++ b/uci.h
@@ -9,7 +9,7 @@
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  */
 
 #ifndef __LIBUCI_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;
@@ -188,6 +186,14 @@ extern int uci_set(struct uci_context *ctx, struct uci_ptr *ptr);
 extern int uci_add_list(struct uci_context *ctx, struct uci_ptr *ptr);
 
 /**
+ * uci_del_list: Remove a string from an element list
+ * @ctx: uci context
+ * @ptr: uci pointer (with value)
+ *
+ */
+extern int uci_del_list(struct uci_context *ctx, struct uci_ptr *ptr);
+
+/**
  * uci_reorder: Reposition a section
  * @ctx: uci context
  * @s: uci section to reposition
@@ -256,6 +262,8 @@ extern int uci_set_confdir(struct uci_context *ctx, const char *dir);
  *
  * This function allows you to add directories, which contain 'overlays'
  * for the active config, that will never be committed.
+ * Caller of this API should ensure that no duplicate entries (including the
+ * default search path, e.g. `UCI_SAVEDIR') should be added.
  */
 extern int uci_add_delta_path(struct uci_context *ctx, const char *dir);
 
@@ -293,42 +301,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 <prefix>/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
@@ -379,7 +351,6 @@ enum uci_type {
        UCI_TYPE_BACKEND = 6,
        UCI_TYPE_ITEM = 7,
        UCI_TYPE_HOOK = 8,
-       UCI_TYPE_PLUGIN = 9,
 };
 
 enum uci_option_type {
@@ -441,9 +412,6 @@ struct uci_context
        bool internal, nested;
        char *buf;
        int bufsz;
-
-       struct uci_list hooks;
-       struct uci_list plugins;
 };
 
 struct uci_package
@@ -482,6 +450,9 @@ struct uci_option
        } v;
 };
 
+/*
+ * UCI_CMD_ADD is used for anonymous sections or list values
+ */
 enum uci_command {
        UCI_CMD_ADD,
        UCI_CMD_REMOVE,
@@ -489,7 +460,11 @@ enum uci_command {
        UCI_CMD_RENAME,
        UCI_CMD_REORDER,
        UCI_CMD_LIST_ADD,
+       UCI_CMD_LIST_DEL,
+       __UCI_CMD_MAX,
+       __UCI_CMD_LAST = __UCI_CMD_MAX - 1
 };
+extern char const uci_command_char[];
 
 struct uci_delta
 {
@@ -519,31 +494,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;
@@ -619,8 +569,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
@@ -630,8 +578,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)
@@ -653,8 +599,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)
@@ -662,8 +606,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
 
 /**