move some macro magic out of libuci.c

diff --git a/err.h b/err.h
new file mode 100644 (file)
index 0000000..2800526
--- /dev/null
+++ b/err.h
@@ -0,0 +1,63 @@
+/*
+ * libuci - Library for the Unified Configuration Interface
+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1
+ * as published by the Free Software Foundation
+ *
+ * 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.
+ */
+
+/*
+ * functions for debug and error handling
+ */
+
+#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)
+
+

diff --git a/hash.c b/hash.c
deleted file mode 100644 (file)
index 43b58f4..0000000
--- a/hash.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * libuci - Library for the Unified Configuration Interface
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
- *
- * this program is free software; you can redistribute it and/or modify
- * it under the terms of the gnu lesser general public license version 2.1
- * as published by the free software foundation
- *
- * 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.
- */
-

diff --git a/libuci.c b/libuci.c
index 7f4f158..c3a8fc0 100644 (file)
--- a/libuci.c
+++ b/libuci.c
@@ -21,54 +21,10 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>

-

 #include "libuci.h"
 
 #define DEBUG
 #include "libuci.h"
 
 #define DEBUG

-
-#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)
-
+#include "err.h"

 
 static const char *uci_errstr[] = {
        [UCI_OK] =           "Success",
 
 static const char *uci_errstr[] = {
        [UCI_OK] =           "Success",


@@ -107,7 +63,7 @@ static void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size)
        return ptr;
 }
 
        return ptr;
 }
 

-#include "hash.c"
+#include "list.c"

 #include "parse.c"
 
 /* externally visible functions */
 #include "parse.c"
 
 /* externally visible functions */

diff --git a/list.c b/list.c
new file mode 100644 (file)
index 0000000..43b58f4
--- /dev/null
+++ b/list.c
@@ -0,0 +1,14 @@
+/*
+ * libuci - Library for the Unified Configuration Interface
+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * this program is free software; you can redistribute it and/or modify
+ * it under the terms of the gnu lesser general public license version 2.1
+ * as published by the free software foundation
+ *
+ * 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.
+ */
+