Commit 4b002b9a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove write-only variables

parent e8330066
...@@ -104,7 +104,6 @@ static int Control( stream_t *s, int i_query, va_list args ) ...@@ -104,7 +104,6 @@ static int Control( stream_t *s, int i_query, va_list args )
bool *p_bool; bool *p_bool;
uint64_t *pi_64, i_64; uint64_t *pi_64, i_64;
int i_int;
switch( i_query ) switch( i_query )
{ {
...@@ -138,7 +137,6 @@ static int Control( stream_t *s, int i_query, va_list args ) ...@@ -138,7 +137,6 @@ static int Control( stream_t *s, int i_query, va_list args )
return VLC_EGENERIC; return VLC_EGENERIC;
case STREAM_CONTROL_ACCESS: case STREAM_CONTROL_ACCESS:
i_int = (int) va_arg( args, int );
msg_Err( s, "Hey, what are you thinking ?" msg_Err( s, "Hey, what are you thinking ?"
"DON'T USE STREAM_CONTROL_ACCESS !!!" ); "DON'T USE STREAM_CONTROL_ACCESS !!!" );
return VLC_EGENERIC; return VLC_EGENERIC;
......
...@@ -985,7 +985,6 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, ...@@ -985,7 +985,6 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname,
httpd_host_t *host; httpd_host_t *host;
tls_server_t *p_tls; tls_server_t *p_tls;
char *psz_host; char *psz_host;
vlc_value_t ptrval;
int i; int i;
if( psz_hostname == NULL ) if( psz_hostname == NULL )
...@@ -1015,7 +1014,6 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname, ...@@ -1015,7 +1014,6 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname,
httpd->i_host = 0; httpd->i_host = 0;
httpd->host = NULL; httpd->host = NULL;
ptrval.p_address = httpd;
libvlc_priv (p_this->p_libvlc)->p_httpd = httpd; libvlc_priv (p_this->p_libvlc)->p_httpd = httpd;
vlc_object_attach( httpd, p_this->p_libvlc ); vlc_object_attach( httpd, p_this->p_libvlc );
} }
......
...@@ -211,7 +211,6 @@ int SAP_Add (sap_handler_t *p_sap, session_descriptor_t *p_session) ...@@ -211,7 +211,6 @@ int SAP_Add (sap_handler_t *p_sap, session_descriptor_t *p_session)
{ {
int i; int i;
char psz_addr[NI_MAXNUMERICHOST]; char psz_addr[NI_MAXNUMERICHOST];
bool b_ipv6 = false, b_ssm = false;
sap_session_t *p_sap_session; sap_session_t *p_sap_session;
mtime_t i_hash; mtime_t i_hash;
union union
...@@ -243,18 +242,11 @@ int SAP_Add (sap_handler_t *p_sap, session_descriptor_t *p_session) ...@@ -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" memcpy( a6->s6_addr + 2, "\x00\x00\x00\x00\x00\x00"
"\x00\x00\x00\x00\x00\x02\x7f\xfe", 14 ); "\x00\x00\x00\x00\x00\x02\x7f\xfe", 14 );
if( IN6_IS_ADDR_MULTICAST( a6 ) ) if( IN6_IS_ADDR_MULTICAST( a6 ) )
{
/* SSM <=> ff3x::/32 */
b_ssm = (U32_AT (a6->s6_addr) & 0xfff0ffff) == 0xff300000;
/* force flags to zero, preserve scope */ /* force flags to zero, preserve scope */
a6->s6_addr[1] &= 0xf; a6->s6_addr[1] &= 0xf;
}
else else
/* Unicast IPv6 - assume global scope */ /* Unicast IPv6 - assume global scope */
memcpy( a6->s6_addr, "\xff\x0e", 2 ); memcpy( a6->s6_addr, "\xff\x0e", 2 );
b_ipv6 = true;
break; break;
} }
#endif #endif
...@@ -280,11 +272,7 @@ int SAP_Add (sap_handler_t *p_sap, session_descriptor_t *p_session) ...@@ -280,11 +272,7 @@ int SAP_Add (sap_handler_t *p_sap, session_descriptor_t *p_session)
ipv4 = 0; ipv4 = 0;
else else
/* other addresses => 224.2.127.254 */ /* other addresses => 224.2.127.254 */
{
/* SSM: 232.0.0.0/8 */
b_ssm = (ipv4 & htonl (255 << 24)) == htonl (232 << 24);
ipv4 = htonl (0xe0027ffe); ipv4 = htonl (0xe0027ffe);
}
if( ipv4 == 0 ) if( ipv4 == 0 )
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment