From: Clément Stenac <zorglub@videolan.org>
Date: Mon, 15 Aug 2005 14:57:02 +0000 (+0000)
Subject: Fix a few warnings
X-Git-Tag: 0.8.4~829
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=39cc95b62529366b05633376c784ef11f76426b1;p=vlc

Fix a few warnings
---

diff --git a/include/vlc_access.h b/include/vlc_access.h
index 94b76c00f1..b06d243a00 100644
--- a/include/vlc_access.h
+++ b/include/vlc_access.h
@@ -56,7 +56,7 @@ enum access_query_e
      * XXX: avoid to use it unless you can't */
     ACCESS_SET_PRIVATE_ID_STATE,    /* arg1= int i_private_data, vlc_bool_t b_selected can fail */
     ACCESS_SET_PRIVATE_ID_CA,    /* arg1= int i_program_number, uint16_t i_vpid, uint16_t i_apid1, uint16_t i_apid2, uint16_t i_apid3, uint8_t i_length, uint8_t *p_data */
-    ACCESS_GET_PRIVATE_ID_STATE,    /* arg1=int i_private_data arg2=vlc_bool_t *  res=can fail */
+    ACCESS_GET_PRIVATE_ID_STATE     /* arg1=int i_private_data arg2=vlc_bool_t *  res=can fail */
 };
 
 struct access_t
diff --git a/include/vlc_demux.h b/include/vlc_demux.h
index 05053d13ea..79a264535f 100644
--- a/include/vlc_demux.h
+++ b/include/vlc_demux.h
@@ -105,7 +105,7 @@ enum demux_query_e
     DEMUX_CAN_PAUSE,            /* arg1= vlc_bool_t*    cannot fail */
     DEMUX_CAN_CONTROL_PACE,     /* arg1= vlc_bool_t*    cannot fail */
     DEMUX_GET_PTS_DELAY,        /* arg1= int64_t*       cannot fail */
-    DEMUX_SET_PAUSE_STATE, /* arg1= vlc_bool_t     can fail */
+    DEMUX_SET_PAUSE_STATE       /* arg1= vlc_bool_t     can fail */
 };
 
 /* stream_t *s could be null and then it mean a access+demux in one */
diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h
index 91cf8ddb60..3a008949f2 100644
--- a/include/vlc_es_out.h
+++ b/include/vlc_es_out.h
@@ -81,7 +81,7 @@ enum es_out_query_e
     /* Set meta data for group (dynamic) */
     ES_OUT_SET_GROUP_META,  /* arg1=int i_group arg2=vlc_meta_t */
     /* */
-    ES_OUT_DEL_GROUP,       /* arg1=int i_group */
+    ES_OUT_DEL_GROUP        /* arg1=int i_group */
 };
 
 struct es_out_t
diff --git a/include/vlc_input.h b/include/vlc_input.h
index 58740d1466..09f2218553 100644
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -280,7 +280,7 @@ enum input_state_e
     INIT_S,
     PLAYING_S,
     PAUSE_S,
-    END_S,
+    END_S
 };
 
 /* "rate" default, min/max
@@ -463,7 +463,7 @@ enum input_query_e
     INPUT_SET_BOOKMARK,    /* arg1= int  res=can fail    */
 
     /* On the fly input slave */
-    INPUT_ADD_SLAVE,       /* arg1= char * */
+    INPUT_ADD_SLAVE        /* arg1= char * */
 };
 
 VLC_EXPORT( int, input_vaControl,( input_thread_t *, int i_query, va_list  ) );
diff --git a/include/vlc_stream.h b/include/vlc_stream.h
index c6b85ff525..0de036c108 100644
--- a/include/vlc_stream.h
+++ b/include/vlc_stream.h
@@ -54,8 +54,8 @@ enum stream_query_e
 
     /* Special for direct access control from demuxer.
      * XXX: avoid using it by all means */
-    STREAM_CONTROL_ACCESS,      /* arg1= int i_access_query, args   res: can fail
-                                   if access unreachable or access control answer */
+    STREAM_CONTROL_ACCESS   /* arg1= int i_access_query, args   res: can fail
+                             if access unreachable or access control answer */
 };
 
 /**
diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c
index 5aed920aad..d4335fc0e9 100644
--- a/src/stream_output/sap.c
+++ b/src/stream_output/sap.c
@@ -552,7 +552,7 @@ static int announce_SAPAnnounceDel( sap_handler_t *p_sap,
 static int announce_SendSAPAnnounce( sap_handler_t *p_sap,
                                      sap_session_t *p_session )
 {
-    int i_ret;
+    unsigned int i_ret;
 
     /* This announce has never been sent yet */
     if( p_session->i_last == 0 )