X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=uci_internal.h;h=eba014397f36bf3b01cdf18d13bd91111d3c3b7a;hp=fdaf04a303c1dea6f9755df57a6027cd7651dc7a;hb=d7cd87ffcc777f7e89747f859eb9a094c431ffd7;hpb=7cefa00eadb4292d2c915a38a86e588c6e539d26

diff --git a/uci_internal.h b/uci_internal.h
index fdaf04a..eba0143 100644
--- a/uci_internal.h
+++ b/uci_internal.h
@@ -42,7 +42,8 @@ struct uci_parse_context
 __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 void uci_add_history(struct uci_context *ctx, struct uci_list *list, int cmd, char *section, char *option, char *value);
+__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);
 
@@ -110,7 +111,7 @@ struct uci_backend _var = {		\
 #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)		\
@@ -118,7 +119,7 @@ struct uci_backend _var = {		\
 	ctx->internal = false;		\
 	if (__val) {			\
 		DPRINTF("LEAVE: %s, ret=%d\n", __func__, __val); \
-		ctx->errno = __val;	\
+		ctx->err = __val;	\
 		return __val;		\
 	}				\
 } while (0)
@@ -135,7 +136,7 @@ struct uci_backend _var = {		\
 	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;		\
 	}