add -Wno-unused and -Werror

[project/uci.git] / libuci.c

diff --git a/libuci.c b/libuci.c
index 66b702d..c3a8fc0 100644 (file)
--- a/libuci.c
+++ b/libuci.c
@@ -17,58 +17,16 @@
  */
 
 #include <sys/types.h>
-#include <stdio.h>
+#include <stdbool.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include "libuci.h"
 
 #define DEBUG
+#include "err.h"
 
-#ifdef DEBUG
-#define DPRINTF(...) fprintf(stderr, __VA_ARGS__)
-#else
-#define DPRINTF(...)
-#endif
-/* 
- * throw an uci exception and store the error number
- * in the context.
- */
-#define UCI_THROW(ctx, err) do {       \
-       longjmp(ctx->trap, err);        \
-} while (0)
-
-/*
- * store the return address for handling exceptions
- * needs to be called in every externally visible library function
- *
- * NB: this does not handle recursion at all. Calling externally visible
- * functions from other uci functions is only allowed at the end of the
- * calling function.
- */
-#define UCI_HANDLE_ERR(ctx) do {               \
-       int __val;                      \
-       if (!ctx)                       \
-               return UCI_ERR_INVAL;   \
-       __val = setjmp(ctx->trap);      \
-       if (__val) {                    \
-               ctx->errno = __val;     \
-               return __val;           \
-       }                               \
-} while (0)
-
-/*
- * check the specified condition.
- * throw an invalid argument exception if it's false
- */
-#define UCI_ASSERT(ctx, expr) do {     \
-       if (!(expr)) {                  \
-               DPRINTF("[%s:%d] Assertion failed\n", __FILE__, __LINE__); \
-               UCI_THROW(ctx, UCI_ERR_INVAL);  \
-       }                               \
-} while (0)
-
-
-static char *uci_errstr[] = {
+static const char *uci_errstr[] = {
        [UCI_OK] =           "Success",
        [UCI_ERR_MEM] =      "Out of memory",
        [UCI_ERR_INVAL] =    "Invalid argument",
@@ -105,7 +63,7 @@ static void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size)
        return ptr;
 }
 
-#include "hash.c"
+#include "list.c"
 #include "parse.c"
 
 /* externally visible functions */