lua: include /opt/local/lib and /opt/local/include in the search path on mac os x

[project/uci.git] / libuci.c

diff --git a/libuci.c b/libuci.c
index a1fd92a..4c2bf96 100644 (file)
--- a/libuci.c
+++ b/libuci.c
@@ -9,7 +9,7 @@
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  */
 
 /*
@@ -26,9 +26,6 @@
 #include <glob.h>
 #include "uci.h"
 
-static const char *uci_confdir = UCI_CONFDIR;
-static const char *uci_savedir = UCI_SAVEDIR;
-
 static const char *uci_errstr[] = {
        [UCI_OK] =            "Success",
        [UCI_ERR_MEM] =       "Out of memory",
@@ -40,14 +37,13 @@ static const char *uci_errstr[] = {
        [UCI_ERR_UNKNOWN] =   "Unknown error",
 };
 
-static void uci_cleanup(struct uci_context *ctx);
 static void uci_unload_plugin(struct uci_context *ctx, struct uci_plugin *p);
 
 #include "uci_internal.h"
-#include "util.c"
 #include "list.c"
-#include "history.c"
-#include "file.c"
+
+__private const char *uci_confdir = UCI_CONFDIR;
+__private const char *uci_savedir = UCI_SAVEDIR;
 
 /* exported functions */
 struct uci_context *uci_alloc_context(void)
@@ -60,11 +56,11 @@ struct uci_context *uci_alloc_context(void)
 
        memset(ctx, 0, sizeof(struct uci_context));
        uci_list_init(&ctx->root);
-       uci_list_init(&ctx->history_path);
+       uci_list_init(&ctx->delta_path);
        uci_list_init(&ctx->backends);
        uci_list_init(&ctx->hooks);
        uci_list_init(&ctx->plugins);
-       ctx->flags = UCI_FLAG_STRICT | UCI_FLAG_SAVED_HISTORY;
+       ctx->flags = UCI_FLAG_STRICT | UCI_FLAG_SAVED_DELTA;
 
        ctx->confdir = (char *) uci_confdir;
        ctx->savedir = (char *) uci_savedir;
@@ -90,7 +86,7 @@ void uci_free_context(struct uci_context *ctx)
                struct uci_package *p = uci_to_package(e);
                uci_free_package(&p);
        }
-       uci_foreach_element_safe(&ctx->history_path, tmp, e) {
+       uci_foreach_element_safe(&ctx->delta_path, tmp, e) {
                uci_free_element(e);
        }
        UCI_TRAP_RESTORE(ctx);
@@ -117,7 +113,7 @@ int uci_set_confdir(struct uci_context *ctx, const char *dir)
        return 0;
 }
 
-static void uci_cleanup(struct uci_context *ctx)
+__private void uci_cleanup(struct uci_context *ctx)
 {
        struct uci_parse_context *pctx;
 
@@ -181,7 +177,7 @@ uci_get_errorstr(struct uci_context *ctx, char **dest, const char *prefix)
        if (dest) {
                err = asprintf(dest, format,
                        (prefix ? prefix : ""), (prefix ? ": " : ""),
-                       (ctx->func ? ctx->func : ""), (ctx->func ? ": " : ""),
+                       (ctx && ctx->func ? ctx->func : ""), (ctx && ctx->func ? ": " : ""),
                        uci_errstr[err],
                        error_info);
                if (err < 0)
@@ -190,7 +186,7 @@ uci_get_errorstr(struct uci_context *ctx, char **dest, const char *prefix)
                strcat(error_info, "\n");
                fprintf(stderr, format,
                        (prefix ? prefix : ""), (prefix ? ": " : ""),
-                       (ctx->func ? ctx->func : ""), (ctx->func ? ": " : ""),
+                       (ctx && ctx->func ? ctx->func : ""), (ctx && ctx->func ? ": " : ""),
                        uci_errstr[err],
                        error_info);
        }
@@ -329,6 +325,7 @@ int uci_remove_hook(struct uci_context *ctx, const struct uci_hook_ops *ops)
                struct uci_hook *h = uci_to_hook(e);
                if (h->ops == ops) {
                        uci_list_del(&e->list);
+                       uci_free_element(e);
                        return 0;
                }
        }