}
else if( ( psz_ext && !strcasecmp( psz_ext, ".m3u") ) ||
( psz_ext && !strcasecmp( psz_ext, ".ram") ) ||
+ ( psz_ext && !strcasecmp( psz_ext, ".rm") ) ||
/* A .ram file can contain a single rtsp link */
( p_demux->psz_demux && !strcmp(p_demux->psz_demux, "m3u") ) )
{
}
else if( *psz_parse )
{
+ char *psz_mrl;
if( !psz_name || !*psz_name )
{
- psz_name = strdup( psz_parse ); /* Use filename as name for relative entries */
+ /* Use filename as name for relative entries */
+ psz_name = strdup( psz_parse );
}
- char *psz_mrl =
- ProcessMRL( psz_parse, p_demux->p_sys->psz_prefix );
+
+ psz_mrl = ProcessMRL( psz_parse, p_demux->p_sys->psz_prefix );
b_cleanup = VLC_TRUE;
if( !psz_mrl ) goto error;
/* read SAP packets */
while( !p_sd->b_die )
{
+ int i_read;
p_buffer = (uint8_t *)malloc( MAX_SAP_BUFFER );
if( !p_buffer )
continue;
}
- int i_read = net_Select( p_sd, p_sd->p_sys->pi_fd, NULL,
- p_sd->p_sys->i_fd, p_buffer,
- MAX_SAP_BUFFER, 500000 );
+ i_read = net_Select( p_sd, p_sd->p_sys->pi_fd, NULL,
+ p_sd->p_sys->i_fd, p_buffer,
+ MAX_SAP_BUFFER, 500000 );
#if 0
/* Check for items that need deletion */
for( i = 0 ; i< p_sd->p_sys->i_announces ; i++ )
/* Remove the sap_announce from the array */
REMOVE_ELEM( p_sd->p_sys->pp_announces,
- p_sd->p_sys->i_announces,
- i );
+ p_sd->p_sys->i_announces, i );
free( p_announce );
playlist_t *p_playlist;
- if( !psz_sdp )
- {
- return -1;
- }
+ if( !psz_sdp ) return -1;
/* Gather the complete sdp file */
for( ;; )
p_sap->p_item = p_item;
TAB_APPEND( p_sd->p_sys->i_announces,
- p_sd->p_sys->pp_announces,
- p_sap );
+ p_sd->p_sys->pp_announces, p_sap );
return p_sap;
}
case( 'a' ): /* attribute */
{
char *psz_eon = strchr( &psz_sdp[2], ':' );
-
- attribute_t *p_attr = (attribute_t *)malloc(
- sizeof( attribute_t ) );
+ attribute_t *p_attr = malloc( sizeof( attribute_t ) );
/* Attribute with value */
if( psz_eon )
/***********************************************************************
* ismult: returns true if we have a multicast address
***********************************************************************/
-
static int ismult( char *psz_uri )
{
char *psz_end;
return( i_value < 224 ? VLC_FALSE : VLC_TRUE );
}
-static int InitSocket( services_discovery_t *p_sd, char *psz_address, int i_port )
+static int InitSocket( services_discovery_t *p_sd, char *psz_address,
+ int i_port )
{
int i_fd = net_OpenUDP( p_sd, psz_address, i_port, "", 0 );
if( i_fd != -1 )
{
- INSERT_ELEM( p_sd->p_sys->pi_fd,
- p_sd->p_sys->i_fd,
- p_sd->p_sys->i_fd,
- i_fd );
+ INSERT_ELEM( p_sd->p_sys->pi_fd, p_sd->p_sys->i_fd,
+ p_sd->p_sys->i_fd, i_fd );
return VLC_SUCCESS;
}
playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_sd,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
- if( p_announce->p_sdp )
- {
- FreeSDP( p_announce->p_sdp );
- }
+ if( p_announce->p_sdp ) FreeSDP( p_announce->p_sdp );
- if( !p_playlist )
- {
- return VLC_EGENERIC;
- }
+ if( !p_playlist ) return VLC_EGENERIC;
if( p_announce->p_item )
{
p_sdp1->psz_address_type && p_sdp2->psz_address_type &&
p_sdp1->psz_address && p_sdp2->psz_address )
{
- if(
- !strcmp( p_sdp1->psz_username , p_sdp2->psz_username ) &&
+ if(!strcmp( p_sdp1->psz_username , p_sdp2->psz_username ) &&
!strcmp( p_sdp1->psz_network_type , p_sdp2->psz_network_type ) &&
!strcmp( p_sdp1->psz_address_type , p_sdp2->psz_address_type ) &&
!strcmp( p_sdp1->psz_address , p_sdp2->psz_address ) &&