[ekg2-commit] ekg2: scripts.c (HEAD) scripts.h (HEAD) [darkjames]

[CVS commit]

Module name:	ekg2
Changes by:	darkjames	2007-05-03 16:03:13

Modified files:
	scripts.c scripts.h

Log message:
allow bind stuff from queries.h

Index: scripts.c
===================================================================
RCS file: /home/cvs/ekg2/ekg/scripts.c,v
diff -d -u -r1.38 -r1.39
--- scripts.c	3 May 2007 13:30:45 -0000	1.38
+++ scripts.c	3 May 2007 14:03:12 -0000	1.39
@@ -666,8 +666,12 @@
 		int i;
 		for (i = 0; i < QUERY_EXTERNAL; i++) {
 			if (!xstrcmp(qname, (query_name(i)))) {
-				/* XXX */
-				debug_error("XXX %s; %d\n", qname, i);
+				const struct query *q = query_struct(i);
+				int j = 0;
+
+				while (j < QUERY_ARGS_MAX && q->params[j] != QUERY_ARG_END)
+					NEXT_ARG(q->params[j++]);
+
 				break;
 			}
 		}
@@ -744,8 +748,9 @@
 	script_query_t	*temp = data;
 	void 		*args[MAX_ARGS];
 	int		i;
+
 	SCRIPT_HANDLER_HEADER(script_handler_query_t);
-	
+
 	for (i=0; i < temp->argc; i++) 
 		args[i] = (void *) va_arg(ap, void *);
 	

Index: scripts.h
===================================================================
RCS file: /home/cvs/ekg2/ekg/scripts.h,v
diff -d -u -r1.17 -r1.18
--- scripts.h	3 May 2007 13:30:45 -0000	1.17
+++ scripts.h	3 May 2007 14:03:12 -0000	1.18
@@ -7,9 +7,10 @@
 #include "protocol.h"
 #include "stuff.h"
 #include "vars.h"
+#include "queries.h"
 
 #define SCRIPT_HANDLE_UNBIND    -666
-#define MAX_ARGS 15
+#define MAX_ARGS QUERY_ARGS_MAX+1
 
 typedef enum {
 	SCRIPT_UNKNOWNTYPE,