X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=utils.c;h=1b9d6722b406b1144804331ff9d8572e7e0de555;hp=c9ca2069af832b8cd48b101623f69791367b86be;hb=b2b2e69b19a20a46f3db6d717a899248fa24628c;hpb=275a37dbf280bd471ebb2c673267c49a81071bbb

diff --git a/utils.c b/utils.c
index c9ca206..1b9d672 100644
--- a/utils.c
+++ b/utils.c
@@ -27,6 +27,9 @@ static int lock_fd = -1;
 static pid_t pipe_pid = -1;
 static FILE *pipe_fd = NULL;
 
+bool fw3_pr_debug = false;
+
+
 static void
 warn_elem_section_name(struct uci_section *s, bool find_name)
 {
@@ -250,10 +253,18 @@ __fw3_command_pipe(bool silent, const char *command, ...)
 void
 fw3_pr(const char *fmt, ...)
 {
-    va_list args;
-    va_start(args, fmt);
-    vfprintf(pipe_fd, fmt, args);
-    va_end(args);
+	va_list args;
+
+	if (fw3_pr_debug && pipe_fd != stdout)
+	{
+		va_start(args, fmt);
+		vfprintf(stderr, fmt, args);
+		va_end(args);
+	}
+
+	va_start(args, fmt);
+	vfprintf(pipe_fd, fmt, args);
+	va_end(args);
 }
 
 void
@@ -483,3 +494,25 @@ fw3_set_running(void *object, struct list_head *dest)
 	else if (!dest && o->running_list.next)
 		list_del(&o->running_list);
 }
+
+void
+fw3_free_object(void *obj, const void *opts)
+{
+	const struct fw3_option *ol;
+	struct list_head *list, *cur, *tmp;
+
+	for (ol = opts; ol->name; ol++)
+	{
+		if (!ol->elem_size)
+			continue;
+
+		list = (struct list_head *)((char *)obj + ol->offset);
+		list_for_each_safe(cur, tmp, list)
+		{
+			list_del(cur);
+			free(cur);
+		}
+	}
+
+	free(obj);
+}