Skip to content

L
libdvbpsi
Commit 3f024b2b authored by Daniel Kamil Kozar's avatar Daniel Kamil Kozar Committed by Jean-Paul Saman
Browse files
Options

add an init template for arrays 

Signed-off-by: default avatarJean-Paul Saman <jpsaman@videolan.org>
parent 00462a10
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 0 deletions
misc/dr.xsl
View file @ 3f024b2b
...@@ -98,6 +98,9 @@ static int main_<xsl:value-of select="@sname" />_<xsl:value-of select="@msuffix" ...@@ -98,6 +98,9 @@ static int main_<xsl:value-of select="@sname" />_<xsl:value-of select="@msuffix"
<xsl:template match="boolean" mode="init"> <xsl:template match="boolean" mode="init">
BOZO_init_boolean(<xsl:value-of select="@name" />, <xsl:value-of select="@default" />);</xsl:template> BOZO_init_boolean(<xsl:value-of select="@name" />, <xsl:value-of select="@default" />);</xsl:template>
<xsl:template match="array" mode="init">
BOZO_init_array(<xsl:value-of select="@len_name" />);</xsl:template>
<xsl:template match="insert" mode="init"> <xsl:template match="insert" mode="init">
<xsl:value-of select="begin" /> <xsl:value-of select="begin" />
</xsl:template> </xsl:template>
......
misc/test_dr.c
View file @ 3f024b2b
...@@ -449,6 +449,7 @@ static int main_ca_(void) ...@@ -449,6 +449,7 @@ static int main_ca_(void)
s_decoded.i_private_length = 0; s_decoded.i_private_length = 0;
BOZO_init_integer(i_ca_system_id, 0); BOZO_init_integer(i_ca_system_id, 0);
BOZO_init_integer(i_ca_pid, 0); BOZO_init_integer(i_ca_pid, 0);
BOZO_init_array(i_private_length);
BOZO_begin_integer(i_ca_system_id, 16) BOZO_begin_integer(i_ca_system_id, 16)
BOZO_DOJOB(CA); BOZO_DOJOB(CA);
BOZO_check_integer(i_ca_system_id, 16) BOZO_check_integer(i_ca_system_id, 16)
...@@ -459,6 +460,7 @@ static int main_ca_(void) ...@@ -459,6 +460,7 @@ static int main_ca_(void)
s_decoded.i_private_length = 0; s_decoded.i_private_length = 0;
BOZO_init_integer(i_ca_system_id, 0); BOZO_init_integer(i_ca_system_id, 0);
BOZO_init_integer(i_ca_pid, 0); BOZO_init_integer(i_ca_pid, 0);
BOZO_init_array(i_private_length);
BOZO_begin_integer(i_ca_pid, 13) BOZO_begin_integer(i_ca_pid, 13)
BOZO_DOJOB(CA); BOZO_DOJOB(CA);
BOZO_check_integer(i_ca_pid, 13) BOZO_check_integer(i_ca_pid, 13)
...@@ -469,6 +471,7 @@ static int main_ca_(void) ...@@ -469,6 +471,7 @@ static int main_ca_(void)
s_decoded.i_private_length = 0; s_decoded.i_private_length = 0;
BOZO_init_integer(i_ca_system_id, 0); BOZO_init_integer(i_ca_system_id, 0);
BOZO_init_integer(i_ca_pid, 0); BOZO_init_integer(i_ca_pid, 0);
BOZO_init_array(i_private_length);
BOZO_begin_array(i_private_data, i_private_length, 0) BOZO_begin_array(i_private_data, i_private_length, 0)
BOZO_DOJOB(CA); BOZO_DOJOB(CA);
BOZO_check_array_begin(i_private_data, i_private_length) BOZO_check_array_begin(i_private_data, i_private_length)
...@@ -489,6 +492,7 @@ static int main_iso639_(void) ...@@ -489,6 +492,7 @@ static int main_iso639_(void)
/* check code */ /* check code */
BOZO_init_array(i_code_count);
BOZO_begin_array(code, i_code_count, 1) BOZO_begin_array(code, i_code_count, 1)
BOZO_DOJOB(ISO639); BOZO_DOJOB(ISO639);
BOZO_check_array_begin(code, i_code_count) BOZO_check_array_begin(code, i_code_count)
...@@ -597,6 +601,7 @@ static int main_copyright_(void) ...@@ -597,6 +601,7 @@ static int main_copyright_(void)
/* check i_copyright_identifier */ /* check i_copyright_identifier */
s_decoded.i_additional_length = 0; s_decoded.i_additional_length = 0;
BOZO_init_integer(i_copyright_identifier, 0); BOZO_init_integer(i_copyright_identifier, 0);
BOZO_init_array(i_additional_length);
BOZO_begin_integer(i_copyright_identifier, 32) BOZO_begin_integer(i_copyright_identifier, 32)
BOZO_DOJOB(Copyright); BOZO_DOJOB(Copyright);
BOZO_check_integer(i_copyright_identifier, 32) BOZO_check_integer(i_copyright_identifier, 32)
...@@ -606,6 +611,7 @@ static int main_copyright_(void) ...@@ -606,6 +611,7 @@ static int main_copyright_(void)
/* check i_additional_info */ /* check i_additional_info */
s_decoded.i_additional_length = 0; s_decoded.i_additional_length = 0;
BOZO_init_integer(i_copyright_identifier, 0); BOZO_init_integer(i_copyright_identifier, 0);
BOZO_init_array(i_additional_length);
BOZO_begin_array(i_additional_info, i_additional_length, 0) BOZO_begin_array(i_additional_info, i_additional_length, 0)
BOZO_DOJOB(Copyright); BOZO_DOJOB(Copyright);
BOZO_check_array_begin(i_additional_info, i_additional_length) BOZO_check_array_begin(i_additional_info, i_additional_length)
...@@ -820,6 +826,7 @@ static int main_network_name_(void) ...@@ -820,6 +826,7 @@ static int main_network_name_(void)
/* check i_name_byte */ /* check i_name_byte */
BOZO_init_array(i_name_length);
BOZO_begin_array(i_name_byte, i_name_length, 0) BOZO_begin_array(i_name_byte, i_name_length, 0)
BOZO_DOJOB(NetworkName); BOZO_DOJOB(NetworkName);
BOZO_check_array_begin(i_name_byte, i_name_length) BOZO_check_array_begin(i_name_byte, i_name_length)
...@@ -840,6 +847,7 @@ static int main_service_list_(void) ...@@ -840,6 +847,7 @@ static int main_service_list_(void)
/* check i_service */ /* check i_service */
BOZO_init_array(i_service_count);
BOZO_begin_array(i_service, i_service_count, 1) BOZO_begin_array(i_service, i_service_count, 1)
BOZO_DOJOB(ServiceList); BOZO_DOJOB(ServiceList);
BOZO_check_array_begin(i_service, i_service_count) BOZO_check_array_begin(i_service, i_service_count)
...@@ -860,6 +868,7 @@ static int main_stuffing_(void) ...@@ -860,6 +868,7 @@ static int main_stuffing_(void)
/* check i_stuffing_byte */ /* check i_stuffing_byte */
BOZO_init_array(i_stuffing_length);
BOZO_begin_array(i_stuffing_byte, i_stuffing_length, 0) BOZO_begin_array(i_stuffing_byte, i_stuffing_length, 0)
BOZO_DOJOB(Stuffing); BOZO_DOJOB(Stuffing);
BOZO_check_array_begin(i_stuffing_byte, i_stuffing_length) BOZO_check_array_begin(i_stuffing_byte, i_stuffing_length)
...@@ -1110,6 +1119,7 @@ static int main_bouquet_name_(void) ...@@ -1110,6 +1119,7 @@ static int main_bouquet_name_(void)
/* check i_char */ /* check i_char */
BOZO_init_array(i_name_length);
BOZO_begin_array(i_char, i_name_length, 0) BOZO_begin_array(i_char, i_name_length, 0)
BOZO_DOJOB(BouquetName); BOZO_DOJOB(BouquetName);
BOZO_check_array_begin(i_char, i_name_length) BOZO_check_array_begin(i_char, i_name_length)
...@@ -1132,6 +1142,7 @@ static int main_service_1(void) ...@@ -1132,6 +1142,7 @@ static int main_service_1(void)
/* check i_service_type */ /* check i_service_type */
s_decoded.i_service_name_length = 0; s_decoded.i_service_name_length = 0;
BOZO_init_integer(i_service_type, 0); BOZO_init_integer(i_service_type, 0);
BOZO_init_array(i_service_provider_name_length);
BOZO_begin_integer(i_service_type, 8) BOZO_begin_integer(i_service_type, 8)
BOZO_DOJOB(Service); BOZO_DOJOB(Service);
BOZO_check_integer(i_service_type, 8) BOZO_check_integer(i_service_type, 8)
...@@ -1141,6 +1152,7 @@ static int main_service_1(void) ...@@ -1141,6 +1152,7 @@ static int main_service_1(void)
/* check i_service_provider_name */ /* check i_service_provider_name */
s_decoded.i_service_name_length = 0; s_decoded.i_service_name_length = 0;
BOZO_init_integer(i_service_type, 0); BOZO_init_integer(i_service_type, 0);
BOZO_init_array(i_service_provider_name_length);
BOZO_begin_array(i_service_provider_name, i_service_provider_name_length, 0) BOZO_begin_array(i_service_provider_name, i_service_provider_name_length, 0)
BOZO_DOJOB(Service); BOZO_DOJOB(Service);
BOZO_check_array_begin(i_service_provider_name, i_service_provider_name_length) BOZO_check_array_begin(i_service_provider_name, i_service_provider_name_length)
...@@ -1163,6 +1175,7 @@ static int main_service_2(void) ...@@ -1163,6 +1175,7 @@ static int main_service_2(void)
/* check i_service_type */ /* check i_service_type */
s_decoded.i_service_provider_name_length = 0; s_decoded.i_service_provider_name_length = 0;
BOZO_init_integer(i_service_type, 0); BOZO_init_integer(i_service_type, 0);
BOZO_init_array(i_service_name_length);
BOZO_begin_integer(i_service_type, 8) BOZO_begin_integer(i_service_type, 8)
BOZO_DOJOB(Service); BOZO_DOJOB(Service);
BOZO_check_integer(i_service_type, 8) BOZO_check_integer(i_service_type, 8)
...@@ -1172,6 +1185,7 @@ static int main_service_2(void) ...@@ -1172,6 +1185,7 @@ static int main_service_2(void)
/* check i_service_name */ /* check i_service_name */
s_decoded.i_service_provider_name_length = 0; s_decoded.i_service_provider_name_length = 0;
BOZO_init_integer(i_service_type, 0); BOZO_init_integer(i_service_type, 0);
BOZO_init_array(i_service_name_length);
BOZO_begin_array(i_service_name, i_service_name_length, 0) BOZO_begin_array(i_service_name, i_service_name_length, 0)
BOZO_DOJOB(Service); BOZO_DOJOB(Service);
BOZO_check_array_begin(i_service_name, i_service_name_length) BOZO_check_array_begin(i_service_name, i_service_name_length)
...@@ -1194,6 +1208,8 @@ static int main_service_3(void) ...@@ -1194,6 +1208,8 @@ static int main_service_3(void)
/* check i_service_type */ /* check i_service_type */
s_decoded.i_service_provider_name_length = 0; s_decoded.i_service_provider_name_length = 0;
BOZO_init_integer(i_service_type, 0); BOZO_init_integer(i_service_type, 0);
BOZO_init_array(i_service_name_length);
BOZO_init_array(i_service_provider_name_length);
BOZO_begin_integer(i_service_type, 8) BOZO_begin_integer(i_service_type, 8)
BOZO_DOJOB(Service); BOZO_DOJOB(Service);
BOZO_check_integer(i_service_type, 8) BOZO_check_integer(i_service_type, 8)
...@@ -1203,6 +1219,8 @@ static int main_service_3(void) ...@@ -1203,6 +1219,8 @@ static int main_service_3(void)
/* check i_service_name */ /* check i_service_name */
s_decoded.i_service_provider_name_length = 0; s_decoded.i_service_provider_name_length = 0;
BOZO_init_integer(i_service_type, 0); BOZO_init_integer(i_service_type, 0);
BOZO_init_array(i_service_name_length);
BOZO_init_array(i_service_provider_name_length);
BOZO_begin_array(i_service_name, i_service_name_length, 0) BOZO_begin_array(i_service_name, i_service_name_length, 0)
BOZO_DOJOB(Service); BOZO_DOJOB(Service);
BOZO_check_array_begin(i_service_name, i_service_name_length) BOZO_check_array_begin(i_service_name, i_service_name_length)
...@@ -1212,6 +1230,8 @@ static int main_service_3(void) ...@@ -1212,6 +1230,8 @@ static int main_service_3(void)
/* check i_service_provider_name */ /* check i_service_provider_name */
s_decoded.i_service_provider_name_length = 0; s_decoded.i_service_provider_name_length = 0;
BOZO_init_integer(i_service_type, 0); BOZO_init_integer(i_service_type, 0);
BOZO_init_array(i_service_name_length);
BOZO_init_array(i_service_provider_name_length);
BOZO_begin_array(i_service_provider_name, i_service_provider_name_length, 0) BOZO_begin_array(i_service_provider_name, i_service_provider_name_length, 0)
BOZO_DOJOB(Service); BOZO_DOJOB(Service);
BOZO_check_array_begin(i_service_provider_name, i_service_provider_name_length) BOZO_check_array_begin(i_service_provider_name, i_service_provider_name_length)
...@@ -1237,6 +1257,7 @@ static int main_linkage_0(void) ...@@ -1237,6 +1257,7 @@ static int main_linkage_0(void)
BOZO_init_integer(i_transport_stream_id, 0); BOZO_init_integer(i_transport_stream_id, 0);
BOZO_init_integer(i_original_network_id, 0); BOZO_init_integer(i_original_network_id, 0);
BOZO_init_integer(i_service_id, 0); BOZO_init_integer(i_service_id, 0);
BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_transport_stream_id, 16) BOZO_begin_integer(i_transport_stream_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(Linkage);
BOZO_check_integer(i_transport_stream_id, 16) BOZO_check_integer(i_transport_stream_id, 16)
...@@ -1249,6 +1270,7 @@ static int main_linkage_0(void) ...@@ -1249,6 +1270,7 @@ static int main_linkage_0(void)
BOZO_init_integer(i_transport_stream_id, 0); BOZO_init_integer(i_transport_stream_id, 0);
BOZO_init_integer(i_original_network_id, 0); BOZO_init_integer(i_original_network_id, 0);
BOZO_init_integer(i_service_id, 0); BOZO_init_integer(i_service_id, 0);
BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_original_network_id, 16) BOZO_begin_integer(i_original_network_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(Linkage);
BOZO_check_integer(i_original_network_id, 16) BOZO_check_integer(i_original_network_id, 16)
...@@ -1261,6 +1283,7 @@ static int main_linkage_0(void) ...@@ -1261,6 +1283,7 @@ static int main_linkage_0(void)
BOZO_init_integer(i_transport_stream_id, 0); BOZO_init_integer(i_transport_stream_id, 0);
BOZO_init_integer(i_original_network_id, 0); BOZO_init_integer(i_original_network_id, 0);
BOZO_init_integer(i_service_id, 0); BOZO_init_integer(i_service_id, 0);
BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_service_id, 16) BOZO_begin_integer(i_service_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(Linkage);
BOZO_check_integer(i_service_id, 16) BOZO_check_integer(i_service_id, 16)
...@@ -1273,6 +1296,7 @@ static int main_linkage_0(void) ...@@ -1273,6 +1296,7 @@ static int main_linkage_0(void)
BOZO_init_integer(i_transport_stream_id, 0); BOZO_init_integer(i_transport_stream_id, 0);
BOZO_init_integer(i_original_network_id, 0); BOZO_init_integer(i_original_network_id, 0);
BOZO_init_integer(i_service_id, 0); BOZO_init_integer(i_service_id, 0);
BOZO_init_array(i_private_data_length);
BOZO_begin_array(i_private_data, i_private_data_length, 0) BOZO_begin_array(i_private_data, i_private_data_length, 0)
BOZO_DOJOB(Linkage); BOZO_DOJOB(Linkage);
BOZO_check_array_begin(i_private_data, i_private_data_length) BOZO_check_array_begin(i_private_data, i_private_data_length)
...@@ -1300,6 +1324,7 @@ static int main_linkage_1(void) ...@@ -1300,6 +1324,7 @@ static int main_linkage_1(void)
BOZO_init_integer(i_transport_stream_id, 0); BOZO_init_integer(i_transport_stream_id, 0);
BOZO_init_integer(i_original_network_id, 0); BOZO_init_integer(i_original_network_id, 0);
BOZO_init_integer(i_service_id, 0); BOZO_init_integer(i_service_id, 0);
BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_transport_stream_id, 16) BOZO_begin_integer(i_transport_stream_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(Linkage);
BOZO_check_integer(i_transport_stream_id, 16) BOZO_check_integer(i_transport_stream_id, 16)
...@@ -1314,6 +1339,7 @@ static int main_linkage_1(void) ...@@ -1314,6 +1339,7 @@ static int main_linkage_1(void)
BOZO_init_integer(i_transport_stream_id, 0); BOZO_init_integer(i_transport_stream_id, 0);
BOZO_init_integer(i_original_network_id, 0); BOZO_init_integer(i_original_network_id, 0);
BOZO_init_integer(i_service_id, 0); BOZO_init_integer(i_service_id, 0);
BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_original_network_id, 16) BOZO_begin_integer(i_original_network_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(Linkage);
BOZO_check_integer(i_original_network_id, 16) BOZO_check_integer(i_original_network_id, 16)
...@@ -1328,6 +1354,7 @@ static int main_linkage_1(void) ...@@ -1328,6 +1354,7 @@ static int main_linkage_1(void)
BOZO_init_integer(i_transport_stream_id, 0); BOZO_init_integer(i_transport_stream_id, 0);
BOZO_init_integer(i_original_network_id, 0); BOZO_init_integer(i_original_network_id, 0);
BOZO_init_integer(i_service_id, 0); BOZO_init_integer(i_service_id, 0);
BOZO_init_array(i_private_data_length);
BOZO_begin_integer(i_service_id, 16) BOZO_begin_integer(i_service_id, 16)
BOZO_DOJOB(Linkage); BOZO_DOJOB(Linkage);
BOZO_check_integer(i_service_id, 16) BOZO_check_integer(i_service_id, 16)
...@@ -1342,6 +1369,7 @@ static int main_linkage_1(void) ...@@ -1342,6 +1369,7 @@ static int main_linkage_1(void)
BOZO_init_integer(i_transport_stream_id, 0); BOZO_init_integer(i_transport_stream_id, 0);
BOZO_init_integer(i_original_network_id, 0); BOZO_init_integer(i_original_network_id, 0);
BOZO_init_integer(i_service_id, 0); BOZO_init_integer(i_service_id, 0);
BOZO_init_array(i_private_data_length);
BOZO_begin_array(i_private_data, i_private_data_length, 0) BOZO_begin_array(i_private_data, i_private_data_length, 0)
BOZO_DOJOB(Linkage); BOZO_DOJOB(Linkage);
BOZO_check_array_begin(i_private_data, i_private_data_length) BOZO_check_array_begin(i_private_data, i_private_data_length)
......
misc/test_dr.h
View file @ 3f024b2b
...@@ -126,6 +126,9 @@ ...@@ -126,6 +126,9 @@
#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
/* array */ /* array */
#define BOZO_init_array(len_name) \
s_decoded.len_name = 0;
#define BOZO_begin_array(name, len_name, min_size) \ #define BOZO_begin_array(name, len_name, min_size) \
if(!i_err) \ if(!i_err) \
{ \ { \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment