use .type instead of .TYPE

[project/uci.git] / uci.h

diff --git a/uci.h b/uci.h
index 5bc2061..cb9fd66 100644 (file)
--- a/uci.h
+++ b/uci.h
@@ -15,6 +15,8 @@
 #ifndef __LIBUCI_H
 #define __LIBUCI_H
 
+#include "uci_config.h"
+
 /*
  * you can use these defines to enable debugging behavior for
  * apps compiled against libuci:
@@ -24,18 +26,14 @@
  *
  */
 
-#ifdef DEBUG_ALL
-#define UCI_DEBUG
-#define UCI_DEBUG_TYPECAST
-#endif
-
 #include <stdbool.h>
 #include <setjmp.h>
 #include <stdio.h>
 
 #define UCI_CONFDIR "/etc/config"
 #define UCI_SAVEDIR "/tmp/.uci"
-#define UCI_FILEMODE   0600
+#define UCI_DIRMODE 0700
+#define UCI_FILEMODE 0600
 
 enum
 {
@@ -148,7 +146,7 @@ extern int uci_unload(struct uci_context *ctx, struct uci_package *p);
  * If section is omitted, then a pointer to the config package is returned
  * If option is omitted, then a pointer to the config section is returned
  */
-extern int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_package *package, char *section, char *option);
+extern int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_package *package, const char *section, const char *option);
 
 /**
  * uci_add_section: Add an unnamed section
@@ -157,7 +155,7 @@ extern int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct
  * @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);
+extern int uci_add_section(struct uci_context *ctx, struct uci_package *p, const char *type, struct uci_section **res);
 
 /**
  * uci_set_element_value: Replace an element's value with a new one
@@ -168,7 +166,7 @@ extern int uci_add_section(struct uci_context *ctx, struct uci_package *p, char
  * Only valid for uci_option and uci_section. Will replace the type string
  * when used with an uci_section
  */
-extern int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, char *value);
+extern int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, const char *value);
 
 /**
  * uci_set: Set an element's value; create the element if necessary
@@ -179,7 +177,7 @@ extern int uci_set_element_value(struct uci_context *ctx, struct uci_element **e
  * @value: value (option) or type (section)
  * @result: store the updated element in this variable (optional)
  */
-extern int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *value, struct uci_element **result);
+extern int uci_set(struct uci_context *ctx, struct uci_package *p, const char *section, const char *option, const char *value, struct uci_element **result);
 
 /**
  * uci_rename: Rename an element
@@ -205,7 +203,7 @@ extern int uci_delete_element(struct uci_context *ctx, struct uci_element *e);
  * @section: section name
  * @option: option name (optional)
  */
-extern int uci_delete(struct uci_context *ctx, struct uci_package *p, char *section, char *option);
+extern int uci_delete(struct uci_context *ctx, struct uci_package *p, const char *section, const char *option);
 
 /**
  * uci_save: save change history for a package
@@ -264,7 +262,7 @@ extern int uci_add_history_path(struct uci_context *ctx, const char *dir);
  * @section: section name (optional)
  * @option option name (optional)
  */
-extern int uci_revert(struct uci_context *ctx, struct uci_package **p, char *section, char *option);
+extern int uci_revert(struct uci_context *ctx, struct uci_package **p, const char *section, const char *option);
 
 /**
  * uci_parse_argument: parse a shell-style argument, with an arbitrary quoting style
@@ -275,13 +273,23 @@ extern int uci_revert(struct uci_context *ctx, struct uci_package **p, char *sec
  */
 extern int uci_parse_argument(struct uci_context *ctx, FILE *stream, char **str, char **result);
 
+/**
+ * uci_set_backend: change the default backend
+ * @ctx: uci context
+ * @name: name of the backend
+ *
+ * The default backend is "file", which uses /etc/config for config storage
+ */
+extern int uci_set_backend(struct uci_context *ctx, const char *name);
+
 /* UCI data structures */
 enum uci_type {
        UCI_TYPE_HISTORY = 0,
        UCI_TYPE_PACKAGE = 1,
        UCI_TYPE_SECTION = 2,
        UCI_TYPE_OPTION = 3,
-       UCI_TYPE_PATH = 4
+       UCI_TYPE_PATH = 4,
+       UCI_TYPE_BACKEND = 5,
 };
 
 enum uci_flags {
@@ -300,12 +308,15 @@ struct uci_element
 
 struct uci_backend
 {
-       const char *name;
+       struct uci_element e;
        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);
-};
 
+       /* private: */
+       const void *ptr;
+       void *priv;
+};
 
 struct uci_context
 {
@@ -317,6 +328,7 @@ struct uci_context
 
        /* backend for import and export */
        struct uci_backend *backend;
+       struct uci_list backends;
 
        /* uci runtime flags */
        enum uci_flags flags;
@@ -328,7 +340,7 @@ struct uci_context
        struct uci_list history_path;
 
        /* private: */
-       int errno;
+       int err;
        const char *func;
        jmp_buf trap;
        bool internal;
@@ -346,6 +358,7 @@ struct uci_package
 
        /* private: */
        struct uci_backend *backend;
+       void *priv;
        int n_section;
        struct uci_list history;
        struct uci_list saved_history;
@@ -382,6 +395,7 @@ struct uci_history
        char *value;
 };
 
+
 /* linked list handling */
 #ifndef offsetof
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
@@ -402,9 +416,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)
 
@@ -447,6 +458,7 @@ struct uci_history
 #define uci_list_empty(list) ((list)->next == (list))
 
 /* wrappers for dynamic type handling */
+#define uci_type_backend UCI_TYPE_BACKEND
 #define uci_type_history UCI_TYPE_HISTORY
 #define uci_type_package UCI_TYPE_PACKAGE
 #define uci_type_section UCI_TYPE_SECTION
@@ -455,6 +467,7 @@ struct uci_history
 /* element typecasting */
 #ifdef UCI_DEBUG_TYPECAST
 static const char *uci_typestr[] = {
+       [uci_type_backend] = "backend",
        [uci_type_history] = "history",
        [uci_type_package] = "package",
        [uci_type_section] = "section",
@@ -475,12 +488,14 @@ static void uci_typecast_error(int from, int to)
                return (struct uci_ ## _type *) e; \
        }
 
+BUILD_CAST(backend)
 BUILD_CAST(history)
 BUILD_CAST(package)
 BUILD_CAST(section)
 BUILD_CAST(option)
 
 #else
+#define uci_to_backend(ptr) container_of(ptr, struct uci_backend, e)
 #define uci_to_history(ptr) container_of(ptr, struct uci_history, e)
 #define uci_to_package(ptr) container_of(ptr, struct uci_package, e)
 #define uci_to_section(ptr) container_of(ptr, struct uci_section, e)