Swedish translation update by Daniel Nylander

[vlc] / modules / access / mms / buffer.c

diff --git a/modules/access/mms/buffer.c b/modules/access/mms/buffer.c
index 22a7856cea4e3cfae955106568f3c364b3d32b3f..06115d35f1e1e259593fecc6ab1332ffc4b7dfac 100644 (file)
--- a/modules/access/mms/buffer.c
+++ b/modules/access/mms/buffer.c
@@ -24,9 +24,12 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 
 #include "asf.h"
 #include "buffer.h"
@@ -51,10 +54,7 @@ int var_buffer_reinitwrite( var_buffer_t *p_buf, int i_default_size )
     if( p_buf->i_size < i_default_size )
     {
         p_buf->i_size = i_default_size;
-        if( p_buf->p_data )
-        {
-            free( p_buf->p_data );
-        }
+        free( p_buf->p_data );
         p_buf->p_data = malloc( p_buf->i_size );
     }
     if( !p_buf->p_data )
@@ -99,7 +99,6 @@ void var_buffer_add64( var_buffer_t *p_buf, uint64_t i_long )
     var_buffer_add32( p_buf, ( i_long >> 32 )&0xffffffff );
 }
 
-
 void var_buffer_addmemory( var_buffer_t *p_buf, void *p_mem, int i_mem )
 {
     /* check if there is enough data */
@@ -115,7 +114,7 @@ void var_buffer_addmemory( var_buffer_t *p_buf, void *p_mem, int i_mem )
     p_buf->i_data += i_mem;
 }
 
-void var_buffer_addUTF16( var_buffer_t *p_buf, char *p_str )
+void var_buffer_addUTF16( var_buffer_t *p_buf, const char *p_str )
 {
     unsigned int i;
     if( !p_str )
@@ -128,7 +127,6 @@ void var_buffer_addUTF16( var_buffer_t *p_buf, char *p_str )
         size_t i_in = strlen( p_str );
         size_t i_out = i_in * 4;
         char *psz_out, *psz_tmp;
-        uint16_t *pw;
 
         psz_out = psz_tmp = malloc( i_out + 1 );
         iconv_handle = vlc_iconv_open( "UTF-16LE", "UTF-8" );
@@ -150,10 +148,7 @@ void var_buffer_addUTF16( var_buffer_t *p_buf, char *p_str )
 
 void var_buffer_free( var_buffer_t *p_buf )
 {
-    if( p_buf->p_data )
-    {
-        free( p_buf->p_data );
-    }
+    free( p_buf->p_data );
     p_buf->i_data = 0;
     p_buf->i_size = 0;
 }
@@ -177,7 +172,6 @@ uint8_t var_buffer_get8 ( var_buffer_t *p_buf )
     return( i_byte );
 }
 
-
 uint16_t var_buffer_get16( var_buffer_t *p_buf )
 {
     uint16_t i_b1, i_b2;
@@ -220,7 +214,6 @@ int var_buffer_getmemory ( var_buffer_t *p_buf, void *p_mem, int64_t i_mem )
     }
     if( i_copy < 0 )
     {
-//        fprintf( stderr, "\n**************arrrrrrggggg\n" );
         i_copy = 0;
     }
     p_buf->i_data += i_copy;
@@ -245,4 +238,3 @@ void var_buffer_getguid( var_buffer_t *p_buf, guid_t *p_guid )
         p_guid->v4[i] = var_buffer_get8( p_buf );
     }
 }
-