Skip to content

L
libdvbpsi
Commit 0ad4a56c authored by Christophe Massiot's avatar Christophe Massiot
Browse files
Options

* src/tables/*.h: Protect multiple-lines macros with { }

parent 64f314d9
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 10 deletions
src/tables/eit.h
View file @ 0ad4a56c
......@@ -185,9 +185,11 @@ void dvbpsi_InitEIT(dvbpsi_eit_t* p_eit, uint16_t i_service_id, uint8_t i_versio
* \return nothing.
*/
#define dvbpsi_NewEIT(p_eit, i_service_id, i_version, b_current_next, i_ts_id, i_network_id, i_segment_last_section_number, i_last_table_id) \
do { \
p_eit = (dvbpsi_eit_t*)malloc(sizeof(dvbpsi_eit_t)); \
if(p_eit != NULL) \
dvbpsi_InitEIT(p_eit, i_service_id, i_version, b_current_next, i_ts_id, i_network_id, i_segment_last_section_number, i_last_table_id);
dvbpsi_InitEIT(p_eit, i_service_id, i_version, b_current_next, i_ts_id, i_network_id, i_segment_last_section_number, i_last_table_id); \
} while(0);
/*****************************************************************************
......@@ -208,8 +210,10 @@ void dvbpsi_EmptyEIT(dvbpsi_eit_t* p_eit);
* \return nothing.
*/
#define dvbpsi_DeleteEIT(p_eit) \
do { \
dvbpsi_EmptyEIT(p_eit); \
free(p_eit);
free(p_eit); \
} while(0);
/*****************************************************************************
......
src/tables/pat.h
View file @ 0ad4a56c
/*****************************************************************************
* pat.h
* (c)2001-2002 VideoLAN
* $Id: pat.h,v 1.5 2002/05/08 13:00:40 bozo Exp $
* $Id$
*
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
*
......@@ -157,9 +157,11 @@ void dvbpsi_InitPAT(dvbpsi_pat_t* p_pat, uint16_t i_ts_id, uint8_t i_version,
* \return nothing.
*/
#define dvbpsi_NewPAT(p_pat, i_ts_id, i_version, b_current_next) \
do { \
p_pat = (dvbpsi_pat_t*)malloc(sizeof(dvbpsi_pat_t)); \
if(p_pat != NULL) \
dvbpsi_InitPAT(p_pat, i_ts_id, i_version, b_current_next);
dvbpsi_InitPAT(p_pat, i_ts_id, i_version, b_current_next); \
} while(0);
/*****************************************************************************
......@@ -180,8 +182,10 @@ void dvbpsi_EmptyPAT(dvbpsi_pat_t* p_pat);
* \return nothing.
*/
#define dvbpsi_DeletePAT(p_pat) \
do { \
dvbpsi_EmptyPAT(p_pat); \
free(p_pat);
free(p_pat); \
} while(0);
/*****************************************************************************
......
src/tables/pmt.h
View file @ 0ad4a56c
/*****************************************************************************
* pmt.h
* (c)2001-2002 VideoLAN
* $Id: pmt.h,v 1.5 2002/03/27 20:02:43 bozo Exp $
* $Id$
*
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
*
......@@ -171,10 +171,12 @@ void dvbpsi_InitPMT(dvbpsi_pmt_t* p_pmt, uint16_t i_program_number,
*/
#define dvbpsi_NewPMT(p_pmt, i_program_number, \
i_version, b_current_next, i_pcr_pid) \
do { \
p_pmt = (dvbpsi_pmt_t*)malloc(sizeof(dvbpsi_pmt_t)); \
if(p_pmt != NULL) \
dvbpsi_InitPMT(p_pmt, i_program_number, i_version, b_current_next, \
i_pcr_pid);
i_pcr_pid); \
} while(0);
/*****************************************************************************
......@@ -195,8 +197,10 @@ void dvbpsi_EmptyPMT(dvbpsi_pmt_t* p_pmt);
* \return nothing.
*/
#define dvbpsi_DeletePMT(p_pmt) \
do { \
dvbpsi_EmptyPMT(p_pmt); \
free(p_pmt);
free(p_pmt); \
} while(0);
/*****************************************************************************
......
src/tables/sdt.h
View file @ 0ad4a56c
......@@ -177,9 +177,11 @@ void dvbpsi_InitSDT(dvbpsi_sdt_t *p_sdt, uint16_t i_ts_id, uint8_t i_version,
* \return nothing.
*/
#define dvbpsi_NewSDT(p_sdt, i_ts_id, i_version, b_current_next,i_network_id) \
do { \
p_sdt = (dvbpsi_sdt_t*)malloc(sizeof(dvbpsi_sdt_t)); \
if(p_sdt != NULL) \
dvbpsi_InitSDT(p_sdt, i_ts_id, i_version, b_current_next, i_network_id);
dvbpsi_InitSDT(p_sdt, i_ts_id, i_version, b_current_next, i_network_id); \
} while(0);
/*****************************************************************************
......@@ -200,8 +202,10 @@ void dvbpsi_EmptySDT(dvbpsi_sdt_t *p_sdt);
* \return nothing.
*/
#define dvbpsi_DeleteSDT(p_sdt) \
do { \
dvbpsi_EmptySDT(p_sdt); \
free(p_sdt);
free(p_sdt); \
} while(0);
/*****************************************************************************
......
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