X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=uci_internal.h;h=111982e80ace1ae26c969be990a3560011480643;hp=5b5a50dfcd41ece6ce7eb3babab243e5d964f6ff;hb=946c51e93303ff71dd5cc44db8a1c2d1d5914625;hpb=68ced4fb649dd492c3f9af7119d00a4a638a32cb

diff --git a/uci_internal.h b/uci_internal.h
index 5b5a50d..111982e 100644
--- a/uci_internal.h
+++ b/uci_internal.h
@@ -15,6 +15,13 @@
 #ifndef __UCI_INTERNAL_H
 #define __UCI_INTERNAL_H
 
+#define __public
+#ifdef UCI_PLUGIN_SUPPORT
+#define __plugin extern
+#else
+#define __plugin static
+#endif
+
 struct uci_parse_context
 {
 	/* error context */
@@ -32,9 +39,46 @@ struct uci_parse_context
 	int bufsz;
 };
 
-int uci_add_backend(struct uci_context *ctx, struct uci_backend *b);
-void uci_add_history(struct uci_context *ctx, struct uci_list *list, int cmd, char *section, char *option, char *value);
-void uci_free_history(struct uci_history *h);
+__plugin void *uci_malloc(struct uci_context *ctx, size_t size);
+__plugin void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size);
+__plugin char *uci_strdup(struct uci_context *ctx, const char *str);
+__plugin bool uci_validate_str(const char *str, bool name);
+__plugin void uci_add_history(struct uci_context *ctx, struct uci_list *list, int cmd, const char *section, const char *option, const char *value);
+__plugin void uci_free_history(struct uci_history *h);
+__plugin struct uci_package *uci_alloc_package(struct uci_context *ctx, const char *name);
+
+#ifdef UCI_PLUGIN_SUPPORT
+/**
+ * uci_add_backend: add an extra backend
+ * @ctx: uci context
+ * @name: name of the backend
+ *
+ * The default backend is "file", which uses /etc/config for config storage
+ */
+__plugin int uci_add_backend(struct uci_context *ctx, struct uci_backend *b);
+
+/**
+ * uci_add_backend: add an extra backend
+ * @ctx: uci context
+ * @name: name of the backend
+ *
+ * The default backend is "file", which uses /etc/config for config storage
+ */
+__plugin int uci_del_backend(struct uci_context *ctx, struct uci_backend *b);
+#endif
+
+#define UCI_BACKEND(_var, _name, ...)	\
+struct uci_backend _var = {		\
+	.e.list = {			\
+		.next = &_var.e.list,	\
+		.prev = &_var.e.list,	\
+	},				\
+	.e.name = _name,		\
+	.e.type = UCI_TYPE_BACKEND,	\
+	.ptr = &_var,			\
+	__VA_ARGS__			\
+}
+
 
 /*
  * functions for debug and error handling, for internal use only
@@ -67,15 +111,16 @@ void uci_free_history(struct uci_history *h);
 #define UCI_HANDLE_ERR(ctx) do {	\
 	DPRINTF("ENTER: %s\n", __func__); \
 	int __val = 0;			\
-	ctx->errno = 0;			\
+	ctx->err = 0;			\
 	if (!ctx)			\
 		return UCI_ERR_INVAL;	\
-	if (!ctx->internal)		\
+	if (!ctx->internal && !ctx->nested) \
 		__val = setjmp(ctx->trap); \
 	ctx->internal = false;		\
+	ctx->nested = false;		\
 	if (__val) {			\
 		DPRINTF("LEAVE: %s, ret=%d\n", __func__, __val); \
-		ctx->errno = __val;	\
+		ctx->err = __val;	\
 		return __val;		\
 	}				\
 } while (0)
@@ -92,7 +137,7 @@ void uci_free_history(struct uci_history *h);
 	memcpy(__old_trap, ctx->trap, sizeof(ctx->trap)); \
 	__val = setjmp(ctx->trap);	\
 	if (__val) {			\
-		ctx->errno = __val;	\
+		ctx->err = __val;	\
 		memcpy(ctx->trap, __old_trap, sizeof(ctx->trap)); \
 		goto handler;		\
 	}
@@ -111,6 +156,18 @@ void uci_free_history(struct uci_history *h);
 	func(ctx, __VA_ARGS__);		\
 } while (0)
 
+/**
+ * UCI_NESTED: Do an normal nested call of a public API function
+ * 
+ * Sets Exception handling to passthrough mode.
+ * Allows API functions to change behavior compared to public use
+ */
+#define UCI_NESTED(func, ctx, ...) do { \
+	ctx->nested = true;		\
+	func(ctx, __VA_ARGS__);		\
+} while (0)
+
+
 /*
  * check the specified condition.
  * throw an invalid argument exception if it's false