A bit of headers cleanup

[vlc] / src / stream_output / announce.c

diff --git a/src/stream_output/announce.c b/src/stream_output/announce.c
index c4d73beb464778af4eee0c281bbbcd6ae7ef6ba8..ca1007896a2cda83bcb897bf23f6539bd363117f 100644 (file)
--- a/src/stream_output/announce.c
+++ b/src/stream_output/announce.c
@@ -29,13 +29,8 @@
 #include <string.h>                                            /* strerror() */
 
 #include <vlc/vlc.h>
-#include <vlc/sout.h>
-
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-#define FREE( p ) if( p ) { free( p ); (p) = NULL; }
-
+#include <vlc_sout.h>
+#include "stream_output.h"
 
 /****************************************************************************
  * Sout-side functions
@@ -159,17 +154,10 @@ session_descriptor_t * sout_AnnounceSessionCreate(void)
     session_descriptor_t *p_session;
 
     p_session = (session_descriptor_t *)malloc( sizeof(session_descriptor_t));
+    if (p_session == NULL)
+        return NULL;
 
-    if( p_session)
-    {
-        p_session->p_sap = NULL;
-        p_session->psz_sdp = NULL;
-        p_session->psz_name = NULL;
-        p_session->psz_uri = NULL;
-        p_session->i_port = 0;
-        p_session->psz_group = NULL;
-    }
-
+    memset (p_session, 0, sizeof (*p_session));
     return p_session;
 }
 
@@ -183,10 +171,10 @@ void sout_AnnounceSessionDestroy( session_descriptor_t *p_session )
 {
     if( p_session )
     {
-        FREE( p_session->psz_name );
-        FREE( p_session->psz_group );
-        FREE( p_session->psz_uri );
-        FREE( p_session->psz_sdp );
+        FREENULL( p_session->psz_name );
+        FREENULL( p_session->psz_group );
+        FREENULL( p_session->psz_uri );
+        FREENULL( p_session->psz_sdp );
         free( p_session );
     }
 }
@@ -232,9 +220,7 @@ announce_handler_t *__announce_HandlerCreate( vlc_object_t *p_this )
     }
 
     p_announce->p_sap = NULL;
-
-    vlc_object_attach( p_announce, p_this->p_vlc);
-
+    vlc_object_attach( p_announce, p_this->p_libvlc);
 
     return p_announce;
 }