[vlc-commits] Remove write-only variables

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Mar  1 17:03:44 2011 +0200| [4b002b9a2f54154b6cb198620a51744ac17df23b] | committer: Rémi Denis-Courmont

Remove write-only variables

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

 src/input/stream_memory.c |    2 --
 src/network/httpd.c       |    2 --
 src/stream_output/sap.c   |   12 ------------
 3 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/src/input/stream_memory.c b/src/input/stream_memory.c
index d73d846..8af8254 100644
--- a/src/input/stream_memory.c
+++ b/src/input/stream_memory.c
@@ -104,7 +104,6 @@ static int Control( stream_t *s, int i_query, va_list args )
 
     bool *p_bool;
     uint64_t   *pi_64, i_64;
-    int        i_int;
 
     switch( i_query )
     {
@@ -138,7 +137,6 @@ static int Control( stream_t *s, int i_query, va_list args )
             return VLC_EGENERIC;
 
         case STREAM_CONTROL_ACCESS:
-            i_int = (int) va_arg( args, int );
             msg_Err( s, "Hey, what are you thinking ?"
                      "DON'T USE STREAM_CONTROL_ACCESS !!!" );
             return VLC_EGENERIC;
diff --git a/src/network/httpd.c b/src/network/httpd.c
index e28277a..10216a8 100644
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -985,7 +985,6 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname,
     httpd_host_t *host;
     tls_server_t *p_tls;
     char *psz_host;
-    vlc_value_t  ptrval;
     int i;
 
     if( psz_hostname == NULL )
@@ -1015,7 +1014,6 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname,
         httpd->i_host = 0;
         httpd->host   = NULL;
 
-        ptrval.p_address = httpd;
         libvlc_priv (p_this->p_libvlc)->p_httpd = httpd;
         vlc_object_attach( httpd, p_this->p_libvlc );
     }
diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c
index 04a3b9e..e072333 100644
--- a/src/stream_output/sap.c
+++ b/src/stream_output/sap.c
@@ -211,7 +211,6 @@ int SAP_Add (sap_handler_t *p_sap, session_descriptor_t *p_session)
 {
     int i;
     char psz_addr[NI_MAXNUMERICHOST];
-    bool b_ipv6 = false, b_ssm = false;
     sap_session_t *p_sap_session;
     mtime_t i_hash;
     union
@@ -243,18 +242,11 @@ int SAP_Add (sap_handler_t *p_sap, session_descriptor_t *p_session)
             memcpy( a6->s6_addr + 2, "\x00\x00\x00\x00\x00\x00"
                    "\x00\x00\x00\x00\x00\x02\x7f\xfe", 14 );
             if( IN6_IS_ADDR_MULTICAST( a6 ) )
-            {
-                /* SSM <=> ff3x::/32 */
-                b_ssm = (U32_AT (a6->s6_addr) & 0xfff0ffff) == 0xff300000;
-
                 /* force flags to zero, preserve scope */
                 a6->s6_addr[1] &= 0xf;
-            }
             else
                 /* Unicast IPv6 - assume global scope */
                 memcpy( a6->s6_addr, "\xff\x0e", 2 );
-
-            b_ipv6 = true;
             break;
         }
 #endif
@@ -280,11 +272,7 @@ int SAP_Add (sap_handler_t *p_sap, session_descriptor_t *p_session)
                 ipv4 = 0;
             else
             /* other addresses => 224.2.127.254 */
-            {
-                /* SSM: 232.0.0.0/8 */
-                b_ssm = (ipv4 & htonl (255 << 24)) == htonl (232 << 24);
                 ipv4 = htonl (0xe0027ffe);
-            }
 
             if( ipv4 == 0 )
             {