Show
Ignore:
Timestamp:
22/08/05 19:58:20 (3 years ago)
Author:
Christophe Massiot <massiot@videolan.org>
git-committer:
Christophe Massiot <massiot@videolan.org> 1124733500 +0000
git-parent:

[de8754326da4a14aed19fed40a4e54f92a1e98a5]

git-author:
Christophe Massiot <massiot@videolan.org> 1124733500 +0000
Message:
  • src/extras/libc.c: Implemented a vlc_readdir_wrapper under Win32. This
    allows to call vlc_readdir_wrapper("\\") and get a list of Windows drives.
    This is a bit kludgy but so convenient to change drives under Windows.
  • modules/control/http: Adapted to use vlc_readdir_wrapper in foreach
    directory. Thou shalt escape all exported functions with E_() to avoid
    potential namespace collisions !
  • po: Re-run make update-po since POTFILES.in has changed.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/control/http/http.c

    r93b017c rd80b925  
    474474        sprintf( volume , "%d" , (int)i_volume ); 
    475475 
    476         p_args->vars = mvar_New( "variables", "" ); 
    477         mvar_AppendNewVar( p_args->vars, "url_param", 
     476        p_args->vars = E_(mvar_New)( "variables", "" ); 
     477        E_(mvar_AppendNewVar)( p_args->vars, "url_param", 
    478478                           i_request > 0 ? "1" : "0" ); 
    479         mvar_AppendNewVar( p_args->vars, "url_value", p_request ); 
    480         mvar_AppendNewVar( p_args->vars, "version", VLC_Version() ); 
    481         mvar_AppendNewVar( p_args->vars, "copyright", COPYRIGHT_MESSAGE ); 
    482         mvar_AppendNewVar( p_args->vars, "vlc_compile_time", 
     479        E_(mvar_AppendNewVar)( p_args->vars, "url_value", p_request ); 
     480        E_(mvar_AppendNewVar)( p_args->vars, "version", VLC_Version() ); 
     481        E_(mvar_AppendNewVar)( p_args->vars, "copyright", COPYRIGHT_MESSAGE ); 
     482        E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_time", 
    483483                           VLC_CompileTime() ); 
    484         mvar_AppendNewVar( p_args->vars, "vlc_compile_by", VLC_CompileBy() ); 
    485         mvar_AppendNewVar( p_args->vars, "vlc_compile_host", 
     484        E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_by", VLC_CompileBy() ); 
     485        E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_host", 
    486486                           VLC_CompileHost() ); 
    487         mvar_AppendNewVar( p_args->vars, "vlc_compile_domain", 
     487        E_(mvar_AppendNewVar)( p_args->vars, "vlc_compile_domain", 
    488488                           VLC_CompileDomain() ); 
    489         mvar_AppendNewVar( p_args->vars, "vlc_compiler", VLC_Compiler() ); 
    490         mvar_AppendNewVar( p_args->vars, "vlc_changeset", VLC_Changeset() ); 
    491         mvar_AppendNewVar( p_args->vars, "stream_position", position ); 
    492         mvar_AppendNewVar( p_args->vars, "stream_time", time ); 
    493         mvar_AppendNewVar( p_args->vars, "stream_length", length ); 
    494         mvar_AppendNewVar( p_args->vars, "volume", volume ); 
    495         mvar_AppendNewVar( p_args->vars, "stream_state", state ); 
    496  
    497         SSInit( &p_args->stack ); 
     489        E_(mvar_AppendNewVar)( p_args->vars, "vlc_compiler", VLC_Compiler() ); 
     490        E_(mvar_AppendNewVar)( p_args->vars, "vlc_changeset", VLC_Changeset() ); 
     491        E_(mvar_AppendNewVar)( p_args->vars, "stream_position", position ); 
     492        E_(mvar_AppendNewVar)( p_args->vars, "stream_time", time ); 
     493        E_(mvar_AppendNewVar)( p_args->vars, "stream_length", length ); 
     494        E_(mvar_AppendNewVar)( p_args->vars, "volume", volume ); 
     495        E_(mvar_AppendNewVar)( p_args->vars, "stream_state", state ); 
     496 
     497        E_(SSInit)( &p_args->stack ); 
    498498 
    499499        /* first we load in a temporary buffer */ 
    …… 
    511511        *pi_data = dst - *pp_data; 
    512512 
    513         SSClean( &p_args->stack ); 
    514         mvar_Delete( p_args->vars ); 
     513        E_(SSClean)( &p_args->stack ); 
     514        E_(mvar_Delete)( p_args->vars ); 
    515515        free( p_buffer ); 
    516516    }