changeset 3794:52a52dac4527

Automated merge with ssh://hg.atheme.org//hg/audacious
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 19 Oct 2007 12:15:37 +0300
parents db6cb4048a74 (diff) 1570f3389835 (current diff)
children 67827c5ab4bd
files
diffstat 2 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/tuple_compiler.c	Fri Oct 19 03:13:36 2007 -0500
+++ b/src/audacious/tuple_compiler.c	Fri Oct 19 12:15:37 2007 +0300
@@ -33,6 +33,10 @@
 #include <stdarg.h>
 #include "tuple_compiler.h"
 
+#define MAX_STR		(256)
+#define MIN_ALLOC_NODES (8)
+#define MIN_ALLOC_BUF	(64)
+
 
 void tuple_error(const char *fmt, ...)
 {
@@ -753,7 +757,7 @@
   assert(ctx != NULL);
   assert(tuple != NULL);
   
-  if (!expr) return NULL;
+  if (!expr) return res;
   
   tuple_formatter_eval_do(ctx, expr, tuple, &res, &resmax, &reslen);
   
--- a/src/audacious/tuple_compiler.h	Fri Oct 19 03:13:36 2007 -0500
+++ b/src/audacious/tuple_compiler.h	Fri Oct 19 12:15:37 2007 +0300
@@ -25,10 +25,7 @@
 #include "tuple.h"
 
 
-#define MAX_VAR		(4)
-#define MAX_STR		(256)
-#define MIN_ALLOC_NODES (8)
-#define MIN_ALLOC_BUF	(64)
+#define TUP_MAX_VARS (4)
 
 
 enum {
@@ -79,8 +76,8 @@
 
 typedef struct _TupleEvalNode {
     gint opcode;		/* operator, see OP_ enums */
-    gint var[MAX_VAR];		/* tuple / global variable references (perhaps hashes, or just indexes to a list?) */
-    gboolean global[MAX_VAR];
+    gint var[TUP_MAX_VARS];	/* tuple / global variable references (perhaps hashes, or just indexes to a list?) */
+    gboolean global[TUP_MAX_VARS];
     gchar *text;		/* raw text, if any (OP_RAW) */
     gint function, expression;	/* for OP_FUNCTION and OP_EXPRESSION */
     struct _TupleEvalNode *children, *next, *prev; /* children of this struct, and pointer to next node. */