#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_IO] = "I/O error",
- [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",
};
#include "util.c"
ctx = (struct uci_context *) malloc(sizeof(struct uci_context));
memset(ctx, 0, sizeof(struct uci_context));
uci_list_init(&ctx->root);
+ ctx->flags = UCI_FLAG_STRICT;
return ctx;
}
UCI_TRAP_SAVE(ctx, ignore);
uci_cleanup(ctx);
uci_foreach_element_safe(&ctx->root, tmp, e) {
- uci_free_package(uci_to_package(e));
+ struct uci_package *p = uci_to_package(e);
+ uci_free_package(&p);
}
free(ctx);
UCI_TRAP_RESTORE(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 (%s) at line %d, byte %d\n", str, uci_errstr[err], (ctx->pctx->reason ? ctx->pctx->reason : "unknown"), 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;
}
}