Changeset 11d2650a5ad1fe504027d2decde1fcbcd79151ce

Show
Ignore:
Timestamp:
06/08/07 21:58:36 (1 year ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1186430316 +0000
git-parent:

[808d1d38213c720564252fdfd25aad51d8ec6803]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1186430316 +0000
Message:

Simplify and remove a warning

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/playlist/loadsave.c

    r1424659 r11d2650  
    137137int playlist_MLDump( playlist_t *p_playlist ) 
    138138{ 
    139     char *psz_uri, *psz_homedir = p_playlist->p_libvlc->psz_homedir; 
     139    char *psz_homedir = p_playlist->p_libvlc->psz_homedir; 
    140140    if( !config_GetInt( p_playlist, "media-library") ) return VLC_SUCCESS; 
    141141    if( !psz_homedir ) 
    …… 
    145145    } 
    146146 
    147     char psz_dirname[ strlen( psz_homedir ) + sizeof( DIR_SEP CONFIG_DIR ) ]; 
     147    char psz_dirname[ strlen( psz_homedir ) 
     148                      + sizeof( DIR_SEP CONFIG_DIR DIR_SEP "ml.xsl")]; 
    148149    sprintf( psz_dirname, "%s" DIR_SEP CONFIG_DIR, psz_homedir ); 
    149150    if( config_CreateDir( (vlc_object_t *)p_playlist, psz_dirname ) ) 
    …… 
    152153    } 
    153154 
    154     asprintf( &psz_uri, "%s" DIR_SEP "%s", psz_dirname, "ml.xsp" ); 
     155    strcat( psz_dirname, DIR_SEP "ml.xsp" ); 
     156     
    155157    stats_TimerStart( p_playlist, "ML Dump", STATS_TIMER_ML_DUMP ); 
    156     playlist_Export( p_playlist, psz_uri, p_playlist->p_ml_category, 
     158    playlist_Export( p_playlist, psz_dirname, p_playlist->p_ml_category, 
    157159                     "export-xspf" ); 
    158160    stats_TimerStop( p_playlist, STATS_TIMER_ML_DUMP ); 
    159161 
    160     free( psz_uri ); 
    161162    return VLC_SUCCESS; 
    162163}