From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 19 Jan 2008 18:21:14 +0000 (+0100)
Subject: move some macro magic out of libuci.c
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4535c379ced2bdb6a4b414f71080fa0c6f5180aa;p=uci.git

move some macro magic out of libuci.c
---

diff --git a/err.h b/err.h
new file mode 100644
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/libuci.c b/libuci.c
index 7f4f158..c3a8fc0 100644
--- a/libuci.c
+++ b/libuci.c
@@ -21,54 +21,10 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-
 #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",
@@ -107,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 */
diff --git a/hash.c b/list.c
similarity index 100%
rename from hash.c
rename to list.c