Replace strerror() with %m (or Linux DVB: strerror_r) - refs #1297

[vlc] / modules / control / http / util.c

diff --git a/modules/control/http/util.c b/modules/control/http/util.c
index 908a4005688b23f74f2391fc62cc5f7b54bfb224..5d2c4a0eddba24403a21f3711312e8daf9e8b475 100644 (file)
--- a/modules/control/http/util.c
+++ b/modules/control/http/util.c
@@ -365,8 +365,8 @@ char *E_(FromUTF8)( intf_thread_t *p_intf, char *psz_utf8 )
         if( i_ret == (size_t)-1 || i_in )
         {
             msg_Warn( p_intf,
-                      "failed to convert \"%s\" to desired charset (%s)",
-                      psz_utf8, strerror(errno) );
+                      "failed to convert \"%s\" to desired charset (%m)",
+                      psz_utf8 );
             free( psz_local );
             return strdup( psz_utf8 );
         }
@@ -395,8 +395,8 @@ char *E_(ToUTF8)( intf_thread_t *p_intf, char *psz_local )
         if( i_ret == (size_t)-1 || i_in )
         {
             msg_Warn( p_intf,
-                      "failed to convert \"%s\" to desired charset (%s)",
-                      psz_local, strerror(errno) );
+                      "failed to convert \"%s\" to desired charset (%m)",
+                      psz_local );
             free( psz_utf8 );
             return strdup( psz_local );
         }
@@ -420,7 +420,7 @@ void E_(PlaylistListNode)( intf_thread_t *p_intf, playlist_t *p_pl,
         if( p_node->i_children == -1 )
         {
             char value[512];
-            char *psz, psz_utf8;
+            char *psz, *psz_utf8;
             mvar_t *itm = E_(mvar_New)( name, "set" );
 
             if( p_pl->status.p_item && p_node &&
@@ -989,7 +989,7 @@ char *E_(RealPath)( intf_thread_t *p_intf, const char *psz_src )
     {
         char *dir;
         /* This is incomplete : we should also support the ~cmassiot/ syntax. */
-        asprintf( &dir, "%s%s", p_intf->p_libvlc->psz_userdir, psz_dir + 1 );
+        asprintf( &dir, "%s%s", p_intf->p_libvlc->psz_homedir, psz_dir + 1 );
         free( psz_dir );
         psz_dir = dir;
     }