p_sys->b_need_update = false;
/* Initialize search chain */
- p_sys->psz_search_chain = (char *)malloc( SEARCH_CHAIN_SIZE + 1 );
+ p_sys->psz_search_chain = malloc( SEARCH_CHAIN_SIZE + 1 );
p_sys->psz_old_search = NULL;
p_sys->i_before_search = 0;
/* Initialize open chain */
- p_sys->psz_open_chain = (char *)malloc( OPEN_CHAIN_SIZE + 1 );
+ p_sys->psz_open_chain = malloc( OPEN_CHAIN_SIZE + 1 );
/* Initialize browser options */
- var_Create( p_intf, "browse-dir", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Get( p_intf, "browse-dir", &val);
-
- if( val.psz_string && *val.psz_string )
- {
- p_sys->psz_current_dir = strdup( val.psz_string );
- }
+ char* psz_tmp = var_CreateGetString( p_intf, "browse-dir" );
+ if( psz_tmp && *psz_tmp )
+ p_sys->psz_current_dir = psz_tmp;
else
{
p_sys->psz_current_dir = strdup( config_GetHomeDir() );
+ free( psz_tmp );
}
- free( val.psz_string );
-
p_sys->i_dir_entries = 0;
p_sys->pp_dir_entries = NULL;
p_sys->b_show_hidden_files = false;
case ' ':
if( p_sys->pp_dir_entries[p_sys->i_box_bidx]->b_file || i_key == ' ' )
{
- int i_size_entry = strlen( "directory://" ) +
- strlen( p_sys->psz_current_dir ) +
- strlen( p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ) + 2;
- char *psz_uri = (char *)malloc( sizeof(char)*i_size_entry);
-
- sprintf( psz_uri, "directory://%s/%s", p_sys->psz_current_dir, p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path );
+ char* psz_uri;
+ if( asprintf( &psz_uri, "directory://%s/%s", p_sys->psz_current_dir, p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ) == -1 )
+ psz_uri = NULL;
playlist_item_t *p_parent = p_sys->p_node;
if( !p_parent )
}
else
{
- int i_size_entry = strlen( p_sys->psz_current_dir ) +
- strlen( p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ) + 2;
- char *psz_uri = (char *)malloc( sizeof(char)*i_size_entry);
-
- sprintf( psz_uri, "%s/%s", p_sys->psz_current_dir, p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path );
-
- p_sys->psz_current_dir = strdup( psz_uri );
- ReadDir( p_intf );
- free( psz_uri );
+ if( asprintf( &(p_sys->psz_current_dir), "%s/%s", p_sys->psz_current_dir,
+ p_sys->pp_dir_entries[p_sys->i_box_bidx]->psz_path ) != -1 )
+ ReadDir( p_intf );
}
break;
default:
{
mvnprintw( y++, 0, COLS, _(" State : Playing %s"), psz_state );
}
- else if( val.i_int == STOP_S )
- {
- mvnprintw( y++, 0, COLS, _(" State : Stopped %s"), psz_state );
- }
else if( val.i_int == OPENING_S )
{
mvnprintw( y++, 0, COLS, _(" State : Opening/Connecting %s"), psz_state );
}
- else if( val.i_int == BUFFERING_S )
- {
- mvnprintw( y++, 0, COLS, _(" State : Buffering %s"), psz_state );
- }
else if( val.i_int == PAUSE_S )
{
mvnprintw( y++, 0, COLS, _(" State : Paused %s"), psz_state );
continue;
}
- psz_uri = (char *)malloc( sizeof(char)*i_size_entry);
- sprintf( psz_uri, "%s/%s", p_sys->psz_current_dir, psz_entry );
+ asprintf( &psz_uri, "%s/%s", p_sys->psz_current_dir, psz_entry );
if( !( p_dir_entry = malloc( sizeof( struct dir_entry_t) ) ) )
{