* modules/access/http.c:

    + Fixed gcc 3 warnings (type punning).
  * modules/access/mms/mmstu.c:
    + Fixed a gcc 3 warning (long constant).

diff --git a/modules/access/http.c b/modules/access/http.c
index 5129660936851b9c8660936db48b839cd4881a5e..d312d33ced5bce54bc5b5c1c91c3b3d666ce031e 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -2,7 +2,7 @@
  * http.c: HTTP access plug-in
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: http.c,v 1.36 2003/06/02 16:01:21 sigmunau Exp $
+ * $Id: http.c,v 1.37 2003/07/16 15:32:40 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -120,6 +120,7 @@ static int HTTPConnect( input_thread_t * p_input, off_t i_tell )
     _input_socket_t * p_access_data;
     module_t * p_network;
     char * psz_parser, * psz_value, * psz_answer;
+    byte_t * p_bytes;
     int i_code, i_ret, i, i_size;
 
     enum { HTTP_PROTOCOL, ICY_PROTOCOL } i_protocol;
@@ -188,7 +189,8 @@ static int HTTPConnect( input_thread_t * p_input, off_t i_tell )
     }
 
     /* Get the HTTP returncode */
-    i_size = input_Peek( p_input, (byte_t**)&psz_parser, MAX_ANSWER_SIZE );
+    i_size = input_Peek( p_input, &p_bytes, MAX_ANSWER_SIZE );
+    psz_parser = (char *)p_bytes;
 
     if( i_size <= 0 )
     {
@@ -260,7 +262,8 @@ static int HTTPConnect( input_thread_t * p_input, off_t i_tell )
     {
         char psz_line[MAX_ANSWER_SIZE];
 
-        i_size = input_Peek( p_input, (byte_t**)&psz_parser, MAX_ANSWER_SIZE );
+        i_size = input_Peek( p_input, &p_bytes, MAX_ANSWER_SIZE );
+        psz_parser = (char *)p_bytes;
 
         if( i_size <= 0 )
         {

diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index 3f15bf9e1193f10153879aff43f732cd8f77ef84..14b70c2972bd0c89c4ee8280783d85fd3c779762 100644 (file)
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -2,7 +2,7 @@
  * mms.c: MMS access plug-in
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: mmstu.c,v 1.4 2003/07/10 23:55:14 fenrir Exp $
+ * $Id: mmstu.c,v 1.5 2003/07/16 15:32:41 sam Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -722,7 +722,7 @@ static int MMSOpen( input_thread_t  *p_input,
     var_buffer_add32( &buffer, 0x00 );
     var_buffer_add32( &buffer, 0x00 );
     var_buffer_add32( &buffer, 0x00 );
-    var_buffer_add64( &buffer, 0x40ac200000000000 );
+    var_buffer_add64( &buffer, (((uint64_t)0x40ac2000)<<32) );
     var_buffer_add32( &buffer, p_sys->i_header_packet_id_type );
     var_buffer_add32( &buffer, 0x00 );
     mms_CommandSend( p_input, 0x15, p_sys->i_command_level, 0x00,