Changeset 4654Tweet

Timestamp:

Sep 22, 2010, 10:34:37 PM (9 years ago)

Author:

Sam Hocevar

Message:

Fix a bug caused by undefined function call precedence.

File:

• zzuf/trunk/src/zzat.c (modified) (3 diffs)

zzuf/trunk/src/zzat.c

@@ -357 +357 @@
 };
 
-static int make_fmt(struct parser *p, char const *fmt)
+static int make_fmt(struct parser *p, char const *fmt, int *nitems)
 {
     char const *tmp;
@@ -375 +375 @@
             tmp++, ret++;
 
-    return ret;
+    *nitems = ret;
+
+    return 1;
 }
 
 #define PARSECMD(fmt, ...) \
-    (make_fmt(&parser, fmt) == sscanf(sequence, parser.tmpfmt, \
-                                      __VA_ARGS__, &parser.ch) \
+    (make_fmt(&parser, fmt, &nitems) \
+         && nitems == sscanf(sequence, parser.tmpfmt, \
+                             ##__VA_ARGS__, &parser.ch) \
          && parser.ch == parser.lastch)
 
@@ -394 +397 @@
     FILE *f = NULL;
     size_t retlen = 0, retoff = 0;
-    int nloops = 0, fd = -1, feofs = 0, finish = 0;
+    int nitems, nloops = 0, fd = -1, feofs = 0, finish = 0;
 
     /* Initialise per-file state */