#include <string.h>
#include <stdlib.h>
#include <stdio.h>
-#include "libuci.h"
-
-#define DEBUG
+#include "uci.h"
#include "err.h"
static const char *uci_errstr[] = {
- [UCI_OK] = "Success",
- [UCI_ERR_MEM] = "Out of memory",
- [UCI_ERR_INVAL] = "Invalid argument",
- [UCI_ERR_NOTFOUND] = "Entry not found",
- [UCI_ERR_PARSE] = "Parse error",
- [UCI_ERR_UNKNOWN] = "Unknown error",
+ [UCI_OK] = "Success",
+ [UCI_ERR_MEM] = "Out of memory",
+ [UCI_ERR_INVAL] = "Invalid argument",
+ [UCI_ERR_NOTFOUND] = "Entry not found",
+ [UCI_ERR_IO] = "I/O error",
+ [UCI_ERR_PARSE] = "Parse error",
+ [UCI_ERR_DUPLICATE] = "Duplicate entry",
+ [UCI_ERR_UNKNOWN] = "Unknown error",
};
-
-/*
- * UCI wrapper for malloc, which uses exception handling
- */
-static void *uci_malloc(struct uci_context *ctx, size_t size)
-{
- void *ptr;
-
- ptr = malloc(size);
- if (!ptr)
- UCI_THROW(ctx, UCI_ERR_MEM);
- memset(ptr, 0, size);
-
- return ptr;
-}
-
-/*
- * UCI wrapper for realloc, which uses exception handling
- */
-static void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size)
-{
- ptr = realloc(ptr, size);
- if (!ptr)
- UCI_THROW(ctx, UCI_ERR_MEM);
-
- return ptr;
-}
-
-/*
- * UCI wrapper for strdup, which uses exception handling
- */
-static char *uci_strdup(struct uci_context *ctx, const char *str)
-{
- char *ptr;
-
- ptr = strdup(str);
- if (!ptr)
- UCI_THROW(ctx, UCI_ERR_MEM);
-
- return ptr;
-}
-
+#include "util.c"
#include "list.c"
-#include "parse.c"
-
-/* externally visible functions */
+#include "file.c"
-struct uci_context *uci_alloc(void)
+/* exported functions */
+struct uci_context *uci_alloc_context(void)
{
struct uci_context *ctx;
return ctx;
}
+void uci_free_context(struct uci_context *ctx)
+{
+ struct uci_element *e, *tmp;
+
+ UCI_TRAP_SAVE(ctx, ignore);
+ uci_cleanup(ctx);
+ uci_foreach_element_safe(&ctx->root, tmp, e) {
+ uci_free_package(uci_to_package(e));
+ }
+ free(ctx);
+ UCI_TRAP_RESTORE(ctx);
+
+ignore:
+ return;
+}
+
int uci_cleanup(struct uci_context *ctx)
{
UCI_HANDLE_ERR(ctx);
- uci_parse_cleanup(ctx);
+ uci_file_cleanup(ctx);
return 0;
}
-void uci_perror(struct uci_context *ctx, const char *str)
+void uci_perror(struct uci_context *ctx, const char *prefix)
{
int err;
if ((err < 0) || (err >= UCI_ERR_LAST))
err = UCI_ERR_UNKNOWN;
+ if (prefix)
+ fprintf(stderr, "%s: ", prefix);
+ if (ctx->func)
+ fprintf(stderr, "%s: ", ctx->func);
+
switch (err) {
case UCI_ERR_PARSE:
if (ctx->pctx) {
- fprintf(stderr, "%s: %s at line %d, byte %d\n", str, uci_errstr[err], ctx->pctx->line, ctx->pctx->byte);
+ fprintf(stderr, "%s (%s) at line %d, byte %d\n", uci_errstr[err], (ctx->pctx->reason ? ctx->pctx->reason : "unknown"), ctx->pctx->line, ctx->pctx->byte);
break;
}
/* fall through */
default:
- fprintf(stderr, "%s: %s\n", str, uci_errstr[err]);
+ fprintf(stderr, "%s\n", uci_errstr[err]);
break;
}
}