src/tables/nit.*: Make dvbpsi_NewNIT() and dvbpsi_DeleteNIT() functions.

src/tables/nit.c

@@ -151,7 +151,7 @@ void dvbpsi_DetachNIT(dvbpsi_t * p_dvbpsi, uint8_t i_table_id,
     p_subdec = NULL;
 }
 
-/*****************************************************************************
+/****************************************************************************
  * dvbpsi_InitNIT
  *****************************************************************************
  * Initialize a pre-allocated dvbpsi_nit_t structure.
@@ -166,6 +166,20 @@ void dvbpsi_InitNIT(dvbpsi_nit_t* p_nit, uint16_t i_network_id,
     p_nit->p_first_ts = NULL;
 }
 
+/****************************************************************************
+ * dvbpsi_NewNIT
+ *****************************************************************************
+ * Allocate and initialize a dvbpsi_nit_t structure.
+ *****************************************************************************/
+dvbpsi_nit_t *dvbpsi_NewNIT(uint16_t i_network_id, uint8_t i_version,
+                            bool b_current_next)
+{
+    dvbpsi_nit_t*p_nit = (dvbpsi_nit_t*)malloc(sizeof(dvbpsi_nit_t));
+    if (p_nit != NULL)
+       dvbpsi_InitNIT(p_nit, i_network_id, i_version, b_current_next);
+    return p_nit;
+}
+
 /*****************************************************************************
  * dvbpsi_EmptyNIT
  *****************************************************************************
@@ -189,6 +203,18 @@ void dvbpsi_EmptyNIT(dvbpsi_nit_t* p_nit)
     p_nit->p_first_ts = NULL;
 }
 
+/****************************************************************************
+ * dvbpsi_DeleteNIT
+ *****************************************************************************
+ * Clean and delete a dvbpsi_nit_t structure.
+ *****************************************************************************/
+void dvbpsi_DeleteNIT(dvbpsi_nit_t *p_nit)
+{
+    if (p_nit)
+        dvbpsi_EmptyNIT(p_nit);
+    free(p_nit);
+}
+
 /*****************************************************************************
  * dvbpsi_NITAddDescriptor
  *****************************************************************************

src/tables/nit.h

@@ -153,22 +153,16 @@ void dvbpsi_InitNIT(dvbpsi_nit_t* p_nit, uint16_t i_network_id,
                     uint8_t i_version, bool b_current_next);
 
 /*!
- * \def dvbpsi_NewNIT(p_nit, i_network_id,
-                      i_version, b_current_next)
+ * \fn dvbpsi_nit_t *dvbpsi_NewNIT(uint16_t i_ts_id, uint8_t i_version,
+ *                                 bool b_current_next);
  * \brief Allocate and initialize a new dvbpsi_nit_t structure.
- * \param p_nit pointer to the NIT structure
  * \param i_network_id network id
  * \param i_version NIT version
  * \param b_current_next current next indicator
- * \return nothing.
+ * \return p_nit pointer to the NIT structure
  */
-#define dvbpsi_NewNIT(p_nit, i_network_id,                              \
-                      i_version, b_current_next)                        \
-do {                                                                    \
-  p_nit = (dvbpsi_nit_t*)malloc(sizeof(dvbpsi_nit_t));                  \
-  if(p_nit != NULL)                                                     \
-    dvbpsi_InitNIT(p_nit, i_network_id, i_version, b_current_next);     \
-} while(0);
+dvbpsi_nit_t *dvbpsi_NewNIT(uint16_t i_network_id, uint8_t i_version,
+                            bool b_current_next);
 
 /*****************************************************************************
  * dvbpsi_EmptyNIT/dvbpsi_DeleteNIT
@@ -182,16 +176,12 @@ do {                                                                    \
 void dvbpsi_EmptyNIT(dvbpsi_nit_t* p_nit);
 
 /*!
- * \def dvbpsi_DeleteNIT(p_nit)
+ * \fn dvbpsi_DeleteNIT(dvbpsi_nit_t *p_nit)
  * \brief Clean and free a dvbpsi_nit_t structure.
  * \param p_nit pointer to the NIT structure
  * \return nothing.
  */
-#define dvbpsi_DeleteNIT(p_nit)                                         \
-do {                                                                    \
-  dvbpsi_EmptyNIT(p_nit);                                               \
-  free(p_nit);                                                          \
-} while(0);
+void dvbpsi_DeleteNIT(dvbpsi_nit_t *p_nit);
 
 /*****************************************************************************
  * dvbpsi_NITAddDescriptor