Avoid capturing variables too easily.

	* src/muscle_tab.h (MUSCLE_INSERT_BOOL, MUSCLE_OBSTACK_SGROW): Use
	v__ and p__ instead of v and p.

diff --git a/ChangeLog b/ChangeLog
index 457cfd764afc6b524f4d616ef79c0a9b3ca074a9..9890b5fabff5d640a7c6df1be6d34e5db34c1d6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-01  Akim Demaille  <demaille@gostai.com>
+
+       Avoid capturing variables too easily.
+       * src/muscle_tab.h (MUSCLE_INSERT_BOOL, MUSCLE_OBSTACK_SGROW): Use
+       v__ and p__ instead of v and p.
+
 2008-12-01  Akim Demaille  <demaille@gostai.com>
 
        Remove spurious empty line before syncline.

diff --git a/src/muscle_tab.h b/src/muscle_tab.h
index 2f1e51e6602cee8a01787e4ce43556c5421f7c19..941c67e3cad52f70805429504c8796f2e406b2e8 100644 (file)
--- a/src/muscle_tab.h
+++ b/src/muscle_tab.h
@@ -33,8 +33,8 @@ extern struct obstack muscle_obstack;
 
 #define MUSCLE_INSERT_BOOL(Key, Value)                         \
 do {                                                           \
-  int v = Value;                                               \
-  MUSCLE_INSERT_INT (Key, v);                                  \
+  int v__ = Value;                                             \
+  MUSCLE_INSERT_INT (Key, v__);                                        \
 } while(0)
 
 #define MUSCLE_INSERT_INT(Key, Value)                          \
@@ -67,18 +67,18 @@ do {                                                                \
   muscle_insert (Key, obstack_finish (&muscle_obstack));       \
 } while(0)
 
-#define MUSCLE_OBSTACK_SGROW(Obstack, Value)                   \
-do {                                                           \
-  char const *p;                                               \
-  for (p = Value; *p; p++)                                     \
-    switch (*p)                                                        \
-      {                                                                \
-      case '$':        obstack_sgrow (Obstack, "$]["); break;          \
-      case '@':        obstack_sgrow (Obstack, "@@" ); break;          \
-      case '[':        obstack_sgrow (Obstack, "@{" ); break;          \
-      case ']':        obstack_sgrow (Obstack, "@}" ); break;          \
-      default: obstack_1grow (Obstack, *p); break;             \
-      }                                                                \
+#define MUSCLE_OBSTACK_SGROW(Obstack, Value)            \
+do {                                                    \
+  char const *p__;                                      \
+  for (p__ = Value; *p__; p__++)                        \
+    switch (*p__)                                       \
+      {                                                 \
+      case '$':        obstack_sgrow (Obstack, "$]["); break;  \
+      case '@':        obstack_sgrow (Obstack, "@@" ); break;  \
+      case '[':        obstack_sgrow (Obstack, "@{" ); break;  \
+      case ']':        obstack_sgrow (Obstack, "@}" ); break;  \
+      default: obstack_1grow (Obstack, *p__); break;    \
+      }                                                 \
 } while(0)
 
 #define MUSCLE_INSERT_C_STRING(Key, Value)                     \