[vlc-commits] sap: remove bogus error return

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Jun 20 20:00:56 2014 +0300| [97a9763b72f8793b2c3f00a53a8c89ca130dcf82] | committer: Rémi Denis-Courmont

sap: remove bogus error return

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=97a9763b72f8793b2c3f00a53a8c89ca130dcf82
---

 include/vlc_sout.h      |    2 +-
 src/missing.c           |    2 +-
 src/stream_output/sap.c |    4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index b9366f7..cc889eb 100644
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -223,7 +223,7 @@ VLC_API encoder_t * sout_EncoderCreate( vlc_object_t *obj );
  * Announce handler
  ****************************************************************************/
 VLC_API session_descriptor_t* sout_AnnounceRegisterSDP( vlc_object_t *, const char *, const char * ) VLC_USED;
-VLC_API int sout_AnnounceUnRegister(vlc_object_t *,session_descriptor_t* );
+VLC_API void sout_AnnounceUnRegister(vlc_object_t *,session_descriptor_t* );
 #define sout_AnnounceRegisterSDP(o, sdp, addr) \
         sout_AnnounceRegisterSDP(VLC_OBJECT (o), sdp, addr)
 #define sout_AnnounceUnRegister(o, a) \
diff --git a/src/missing.c b/src/missing.c
index d1c7ebd..faed77f 100644
--- a/src/missing.c
+++ b/src/missing.c
@@ -264,7 +264,7 @@ session_descriptor_t *sout_AnnounceRegisterSDP (vlc_object_t *obj,
 }
 
 #undef sout_AnnounceUnRegister
-int sout_AnnounceUnRegister (vlc_object_t *obj, session_descriptor_t *d)
+void sout_AnnounceUnRegister (vlc_object_t *obj, session_descriptor_t *d)
 {
     VLC_UNUSED (obj); VLC_UNUSED (d);
     assert (0);
diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c
index a190344..0a78748 100644
--- a/src/stream_output/sap.c
+++ b/src/stream_output/sap.c
@@ -377,9 +377,8 @@ sout_AnnounceRegisterSDP (vlc_object_t *obj, const char *sdp,
  *
  * \param obj a VLC object
  * \param session the session descriptor
- * \return VLC_SUCCESS
  */
-int sout_AnnounceUnRegister (vlc_object_t *obj, session_descriptor_t *session)
+void sout_AnnounceUnRegister (vlc_object_t *obj, session_descriptor_t *session)
 {
     sap_address_t *addr, **paddr;
     session_descriptor_t **psession;
@@ -426,5 +425,4 @@ found:
     }
 
     free (session);
-    return VLC_SUCCESS;
 }