Do not assume that long long = int64_t

[vlc] / modules / access / http.c

diff --git a/modules/access/http.c b/modules/access/http.c
index bff397480585976db6925ba9baf82c7c9854f3e5..efbdbd68815dd3e2851de7b354caf79847685a85 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -26,11 +26,8 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#define _GNU_SOURCE
 #include <vlc/vlc.h>
 
-#include <string.h>
-#include <stdlib.h>
 
 #include <vlc_access.h>
 
@@ -338,12 +335,9 @@ connect:
         PL_LOCK;
 
         p_input_item = p_playlist->status.p_item->p_input;
-        vlc_mutex_lock( &p_input_item->lock );
-        free( p_input_item->psz_uri );
+        input_item_SetURI( p_input_item, p_sys->psz_location );
         free( p_access->psz_path );
-        p_input_item->psz_uri = strdup( p_sys->psz_location );
         p_access->psz_path = strdup( p_sys->psz_location );
-        vlc_mutex_unlock( &p_input_item->lock );
 
         PL_UNLOCK;
         pl_Release( p_access );
@@ -740,11 +734,11 @@ static int Control( access_t *p_access, int i_query, va_list args )
             p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* );
 
             if( p_sys->psz_icy_name )
-                vlc_meta_SetTitle( p_meta, p_sys->psz_icy_name );
+                vlc_meta_Set( p_meta, vlc_meta_Title, p_sys->psz_icy_name );
             if( p_sys->psz_icy_genre )
-                vlc_meta_SetGenre( p_meta, p_sys->psz_icy_genre );
+                vlc_meta_Set( p_meta, vlc_meta_Genre, p_sys->psz_icy_genre );
             if( p_sys->psz_icy_title )
-                vlc_meta_SetNowPlaying( p_meta, p_sys->psz_icy_title );
+                vlc_meta_Set( p_meta, vlc_meta_NowPlaying, p_sys->psz_icy_title );
             break;
 
         case ACCESS_GET_TITLE_INFO:
@@ -925,44 +919,48 @@ static int Request( access_t *p_access, int64_t i_tell )
     net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs, "User-Agent: %s\r\n",
                 p_sys->psz_user_agent );
     /* Offset */
-    if( ( p_sys->i_version == 1 ) && ( i_tell > 0 ) )
+    if( p_sys->i_version == 1 )
     {
         net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
                     "Range: bytes="I64Fd"-\r\n", i_tell );
     }
 
     /* Authentication */
-    if( p_sys->url.psz_username && *p_sys->url.psz_username )
+    if( p_sys->url.psz_username || p_sys->url.psz_password )
     {
-        char *buf;
+        char buf[strlen( p_sys->url.psz_username ?: "" )
+                  + strlen( p_sys->url.psz_password ?: "" ) + 2];
         char *b64;
 
-        asprintf( &buf, "%s:%s", p_sys->url.psz_username,
-                   p_sys->url.psz_password ? p_sys->url.psz_password : "" );
-
+        snprintf( buf, sizeof( buf ), "%s:%s", p_sys->url.psz_username ?: "",
+                  p_sys->url.psz_password ?: "" );
         b64 = vlc_b64_encode( buf );
-        free( buf );
 
-        net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
-                    "Authorization: Basic %s\r\n", b64 );
-        free( b64 );
+        if( b64 != NULL )
+        {
+             net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
+                         "Authorization: Basic %s\r\n", b64 );
+             free( b64 );
+        }
     }
 
     /* Proxy Authentication */
-    if( p_sys->proxy.psz_username && *p_sys->proxy.psz_username )
+    if( p_sys->proxy.psz_username || p_sys->proxy.psz_password )
     {
-        char *buf;
+        char buf[strlen( p_sys->proxy.psz_username ?: "" )
+                  + strlen( p_sys->proxy.psz_password ?: "" )];
         char *b64;
 
-        asprintf( &buf, "%s:%s", p_sys->proxy.psz_username,
-                   p_sys->proxy.psz_password ? p_sys->proxy.psz_password : "" );
-
+        snprintf( buf, sizeof( buf ), "%s:%s", p_sys->proxy.psz_username ?: "",
+                  p_sys->proxy.psz_password ?: "" );
         b64 = vlc_b64_encode( buf );
-        free( buf );
 
-        net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
-                    "Proxy-Authorization: Basic %s\r\n", b64 );
-        free( b64 );
+        if( b64 != NULL)
+        {
+            net_Printf( VLC_OBJECT(p_access), p_sys->fd, pvs,
+                        "Proxy-Authorization: Basic %s\r\n", b64 );
+            free( b64 );
+        }
     }
 
     /* ICY meta data request */
@@ -1067,7 +1065,7 @@ static int Request( access_t *p_access, int64_t i_tell )
             if( p_sys->b_continuous )
             {
                 p_access->info.i_size = -1;
-                msg_Dbg( p_access, "this frame size="I64Fd, atoll(p ) );
+                msg_Dbg( p_access, "this frame size=%lld", atoll(p ) );
                 p_sys->i_remaining = atoll( p );
             }
             else