xslt whitespace fixes part 2

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

misc/dr.xsl

@@ -140,18 +140,25 @@ static int main_<xsl:value-of select="@sname" />_<xsl:value-of select="@msuffix"
     <xsl:text>)</xsl:text>
     </xsl:when>
     <xsl:otherwise>
-    BOZO_check_array_gen(<xsl:value-of select="@name" />, <xsl:value-of select="@len_name" />)
+  <xsl:text>  BOZO_check_array_gen(</xsl:text>
+    <xsl:value-of select="@name" /><xsl:text>, </xsl:text>
+    <xsl:value-of select="@len_name" />
+    <xsl:text>)</xsl:text>
     </xsl:otherwise>
   </xsl:choose>
     BOZO_CLEAN();
+  BOZO_end_array(<xsl:value-of select="@name" /><xsl:text>, </xsl:text>
   <xsl:choose>
     <xsl:when test="@max_size">
-  BOZO_end_array(<xsl:value-of select="@name" />, <xsl:value-of select="@max_size"/>)
+      <xsl:value-of select="@max_size"/>
     </xsl:when>
     <xsl:otherwise>
-  BOZO_end_array(<xsl:value-of select="@name" />, ARRAY_SIZE(s_decoded.<xsl:value-of select="@name"/>))
+      <xsl:text>ARRAY_SIZE(s_decoded.</xsl:text>
+      <xsl:value-of select="@name"/>
+      <xsl:text>)</xsl:text>
     </xsl:otherwise>
   </xsl:choose>
+  <xsl:text>)</xsl:text>
 
 </xsl:template>
 

misc/test_dr.c

@@ -472,14 +472,10 @@ static int main_ca_(void)
   BOZO_begin_array(i_private_data, i_private_length, 0)
     BOZO_DOJOB(CA);
     BOZO_check_array_begin(i_private_data, i_private_length)
-  
     BOZO_check_array_gen(i_private_data, i_private_length)
-    
     BOZO_CLEAN();
-
   BOZO_end_array(i_private_data, ARRAY_SIZE(s_decoded.i_private_data))
 
-
   BOZO_END(conditional access);
 
   return i_err;
@@ -496,14 +492,10 @@ static int main_iso639_(void)
   BOZO_begin_array(code, i_code_count, 1)
     BOZO_DOJOB(ISO639);
     BOZO_check_array_begin(code, i_code_count)
-  
     BOZO_check_array_gen(code, i_code_count)
-    
     BOZO_CLEAN();
-
   BOZO_end_array(code, ARRAY_SIZE(s_decoded.code))
 
-
   BOZO_END(ISO 639 language);
 
   return i_err;
@@ -617,14 +609,10 @@ static int main_copyright_(void)
   BOZO_begin_array(i_additional_info, i_additional_length, 0)
     BOZO_DOJOB(Copyright);
     BOZO_check_array_begin(i_additional_info, i_additional_length)
-  
     BOZO_check_array_gen(i_additional_info, i_additional_length)
-    
     BOZO_CLEAN();
-
   BOZO_end_array(i_additional_info, ARRAY_SIZE(s_decoded.i_additional_info))
 
-
   BOZO_END(copyright);
 
   return i_err;
@@ -835,14 +823,10 @@ static int main_network_name_(void)
   BOZO_begin_array(i_name_byte, i_name_length, 0)
     BOZO_DOJOB(NetworkName);
     BOZO_check_array_begin(i_name_byte, i_name_length)
-  
     BOZO_check_array_gen(i_name_byte, i_name_length)
-    
     BOZO_CLEAN();
-
   BOZO_end_array(i_name_byte, ARRAY_SIZE(s_decoded.i_name_byte))
 
-
   BOZO_END(network name);
 
   return i_err;
@@ -859,14 +843,10 @@ static int main_stuffing_(void)
   BOZO_begin_array(i_stuffing_byte, i_stuffing_length, 0)
     BOZO_DOJOB(Stuffing);
     BOZO_check_array_begin(i_stuffing_byte, i_stuffing_length)
-  
     BOZO_check_array_gen(i_stuffing_byte, i_stuffing_length)
-    
     BOZO_CLEAN();
-
   BOZO_end_array(i_stuffing_byte, ARRAY_SIZE(s_decoded.i_stuffing_byte))
 
-
   BOZO_END(stuffing);
 
   return i_err;
@@ -883,14 +863,10 @@ static int main_bouquet_name_(void)
   BOZO_begin_array(i_char, i_name_length, 0)
     BOZO_DOJOB(BouquetName);
     BOZO_check_array_begin(i_char, i_name_length)
-  
     BOZO_check_array_gen(i_char, i_name_length)
-    
     BOZO_CLEAN();
-
   BOZO_end_array(i_char, ARRAY_SIZE(s_decoded.i_char))
 
-
   BOZO_END(bouquet name);
 
   return i_err;
@@ -918,14 +894,10 @@ static int main_service_1(void)
   BOZO_begin_array(i_service_provider_name, i_service_provider_name_length, 0)
     BOZO_DOJOB(Service);
     BOZO_check_array_begin(i_service_provider_name, i_service_provider_name_length)
-  
     BOZO_check_array_gen(i_service_provider_name, i_service_provider_name_length)
-    
     BOZO_CLEAN();
-
   BOZO_end_array(i_service_provider_name, ARRAY_SIZE(s_decoded.i_service_provider_name))
 
-
   BOZO_END(service (i_service_provider_name));
 
   return i_err;
@@ -953,14 +925,10 @@ static int main_service_2(void)
   BOZO_begin_array(i_service_name, i_service_name_length, 0)
     BOZO_DOJOB(Service);
     BOZO_check_array_begin(i_service_name, i_service_name_length)
-  
     BOZO_check_array_gen(i_service_name, i_service_name_length)
-    
     BOZO_CLEAN();
-
   BOZO_end_array(i_service_name, ARRAY_SIZE(s_decoded.i_service_name))
 
-
   BOZO_END(service (i_service_name));
 
   return i_err;
@@ -988,27 +956,19 @@ static int main_service_3(void)
   BOZO_begin_array(i_service_name, i_service_name_length, 0)
     BOZO_DOJOB(Service);
     BOZO_check_array_begin(i_service_name, i_service_name_length)
-  
     BOZO_check_array_gen(i_service_name, i_service_name_length)
-    
     BOZO_CLEAN();
-
   BOZO_end_array(i_service_name, 126)
-
   /* check i_service_provider_name */
   s_decoded.i_service_provider_name_length = 0;
   BOZO_init_integer(i_service_type, 0);
   BOZO_begin_array(i_service_provider_name, i_service_provider_name_length, 0)
     BOZO_DOJOB(Service);
     BOZO_check_array_begin(i_service_provider_name, i_service_provider_name_length)
-  
     BOZO_check_array_gen(i_service_provider_name, i_service_provider_name_length)
-    
     BOZO_CLEAN();
-
   BOZO_end_array(i_service_provider_name, 126)
 
-
   BOZO_END(service (both names));
 
   return i_err;
@@ -1027,10 +987,8 @@ static int main_service_list_(void)
     BOZO_check_array_begin(i_service, i_service_count)
     BOZO_check_array_cmp(i_service, i_service_count, dvbpsi_service_list_service_s)
     BOZO_CLEAN();
-  
   BOZO_end_array(i_service, ARRAY_SIZE(s_decoded.i_service))
 
-
   BOZO_END(service list);
 
   return i_err;