try to separate actual checks from looping in BOZO_array macros

Signed-off-by: Jean-Paul Saman <jpsaman@videolan.org>

misc/dr.xsl

@@ -134,7 +134,8 @@ static int main_<xsl:value-of select="@sname" />_<xsl:value-of select="@msuffix"
 
 <xsl:template match="array" mode="check">
   /* check <xsl:value-of select="@name" /> */<xsl:apply-templates select=".." mode="init" />
-  BOZO_begin_array(<xsl:value-of select="@name" />, <xsl:value-of select="@len_name" />, <xsl:value-of select="@min_size" />)
+  BOZO_begin_array(<xsl:value-of select="@name" />)
+  BOZO_loop_array_begin(<xsl:value-of select="@name" />, <xsl:value-of select="@len_name" />, <xsl:value-of select="@min_size" />)
     BOZO_DOJOB(<xsl:value-of select="../@fname" />);
     BOZO_check_array_begin(<xsl:value-of select="@name" />, <xsl:value-of select="@len_name" />)
   <xsl:choose>
@@ -153,7 +154,7 @@ static int main_<xsl:value-of select="@sname" />_<xsl:value-of select="@msuffix"
     </xsl:otherwise>
   </xsl:choose>
     BOZO_CLEAN();
-  BOZO_end_array(<xsl:value-of select="@name" /><xsl:text>, </xsl:text>
+  BOZO_loop_array_end(<xsl:value-of select="@name" /><xsl:text>, </xsl:text>
   <xsl:choose>
     <xsl:when test="@max_size">
       <xsl:value-of select="@max_size"/>
@@ -165,7 +166,7 @@ static int main_<xsl:value-of select="@sname" />_<xsl:value-of select="@msuffix"
     </xsl:otherwise>
   </xsl:choose>
   <xsl:text>)</xsl:text>
-
+  BOZO_end_array
 </xsl:template>
 
 <xsl:template match="insert" mode="check">

misc/test_dr.h

@@ -135,19 +135,23 @@ static void BOZO_fill_array(void *a, size_t len)
   for(size_t i = 0 ; i < len ; ++i) b[i] = rand();
 }
 
-#define BOZO_begin_array(name, len_name, min_size)                      \
+#define BOZO_begin_array(name)                                          \
   if(!i_err)                                                            \
   {                                                                     \
-    fprintf(stdout, "  \"%s\" array check\n", #name);                   \
+    fprintf(stdout, "  \"%s\" array check\n", #name);
+
+#define BOZO_loop_array_begin(name, len_name, min_size)                 \
     i_loop_count = min_size;                                            \
     do                                                                  \
     {                                                                   \
       BOZO_fill_array(s_decoded.name, sizeof(s_decoded.name));          \
       s_decoded.len_name = i_loop_count;
 
-#define BOZO_end_array(name, max_len)                                   \
+#define BOZO_loop_array_end(name, max_len)                              \
     } while(!i_err && i_loop_count < max_len);                          \
-    fprintf(stdout, "\r  iteration count: %22"PRI64d, i_loop_count);       \
+    fprintf(stdout, "\r  iteration count: %22"PRI64d, i_loop_count);
+
+#define BOZO_end_array                                                  \
     if(i_err)                                                           \
       fprintf(stdout, "    FAILED !!!\n");                              \
     else                                                                \