fix more compile errors

[project/uci.git] / libuci.c

diff --git a/libuci.c b/libuci.c
index 400acd8..d4ef8d8 100644 (file)
--- a/libuci.c
+++ b/libuci.c
@@ -16,6 +16,7 @@
  * This file contains some common code for the uci library
  */
 
+#define _GNU_SOURCE
 #include <sys/types.h>
 #include <stdbool.h>
 #include <string.h>
@@ -25,13 +26,14 @@
 #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"
@@ -46,6 +48,7 @@ struct uci_context *uci_alloc_context(void)
        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;
 }
@@ -57,7 +60,8 @@ void uci_free_context(struct uci_context *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);
@@ -73,7 +77,7 @@ int uci_cleanup(struct uci_context *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;
 
@@ -85,15 +89,20 @@ void uci_perror(struct uci_context *ctx, const char *str)
        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;
        }
 }