DTV: don't use NULL for config items

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

diff --git a/modules/access/mms/buffer.c b/modules/access/mms/buffer.c
index a214e72918a8b6e73d299c379baf378f13468b6a..13eff95d48d465ce4ef07e488fbdca643747de0a 100644 (file)
--- a/modules/access/mms/buffer.c
+++ b/modules/access/mms/buffer.c
@@ -25,7 +25,12 @@
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_charset.h>
 
 #include "asf.h"
 #include "buffer.h"
@@ -37,11 +42,8 @@ int var_buffer_initwrite( var_buffer_t *p_buf, int i_default_size )
 {
     p_buf->i_size =  ( i_default_size > 0 ) ? i_default_size : 2048;
     p_buf->i_data = 0;
-    if( !( p_buf->p_data = malloc( p_buf->i_size ) ) )
-    {
-        return( -1 );
-    }
-    return( 0 );
+    p_buf->p_data = malloc( p_buf->i_size );
+    return p_buf->p_data ? 0 : -1;
 }
 
 int var_buffer_reinitwrite( var_buffer_t *p_buf, int i_default_size )
@@ -50,10 +52,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 )
@@ -61,11 +60,7 @@ int var_buffer_reinitwrite( var_buffer_t *p_buf, int i_default_size )
         p_buf->i_size =  ( i_default_size > 0 ) ? i_default_size : 2048;
         p_buf->p_data = malloc( p_buf->i_size );
     }
-    if( !p_buf->p_data )
-    {
-        return( -1 );
-    }
-    return( 0 );
+    return p_buf->p_data ? 0 : -1;
 }
 
 void var_buffer_add8 ( var_buffer_t *p_buf, uint8_t  i_byte )
@@ -74,7 +69,7 @@ void var_buffer_add8 ( var_buffer_t *p_buf, uint8_t  i_byte )
     if( p_buf->i_data >= p_buf->i_size )
     {
         p_buf->i_size += 1024;
-        p_buf->p_data = realloc( p_buf->p_data, p_buf->i_size );
+        p_buf->p_data = xrealloc( p_buf->p_data, p_buf->i_size );
     }
     p_buf->p_data[p_buf->i_data] = i_byte&0xff;
     p_buf->i_data++;
@@ -98,60 +93,46 @@ 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 */
     if( p_buf->i_data + i_mem >= p_buf->i_size )
     {
         p_buf->i_size += i_mem + 1024;
-        p_buf->p_data = realloc( p_buf->p_data, p_buf->i_size );
+        p_buf->p_data = xrealloc( p_buf->p_data, p_buf->i_size );
     }
 
-    memcpy( p_buf->p_data + p_buf->i_data,
-            p_mem,
-            i_mem );
+    memcpy( p_buf->p_data + p_buf->i_data, p_mem, i_mem );
     p_buf->i_data += i_mem;
 }
 
 void var_buffer_addUTF16( var_buffer_t *p_buf, const char *p_str )
 {
-    unsigned int i;
-    if( !p_str )
-    {
-        var_buffer_add16( p_buf, 0 );
-    }
+    uint16_t *p_out;
+    size_t i_out;
+
+    if( p_str != NULL )
+#ifdef WORDS_BIGENDIAN
+        p_out = ToCharset( "UTF-16BE", p_str, &i_out );
+#else
+        p_out = ToCharset( "UTF-16LE", p_str, &i_out );
+#endif
     else
-    {
-        vlc_iconv_t iconv_handle;
-        size_t i_in = strlen( p_str );
-        size_t i_out = i_in * 4;
-        char *psz_out, *psz_tmp;
-
-        psz_out = psz_tmp = malloc( i_out + 1 );
-        iconv_handle = vlc_iconv_open( "UTF-16LE", "UTF-8" );
-        vlc_iconv( iconv_handle, &p_str, &i_in, &psz_tmp, &i_out );
-        vlc_iconv_close( iconv_handle );
-        psz_tmp[0] = '\0';
-        psz_tmp[1] = '\0';
-
-        for( i = 0; ; i += 2 )
-        {
-            uint16_t v = GetWLE( &psz_out[i] );
-            var_buffer_add16( p_buf, v );
-            if( !v )
-                break;
-        }
-        free( psz_out );
-    }
+        p_out = NULL;
+    if( p_out == NULL )
+        i_out = 0;
+
+    i_out /= 2;
+    for( size_t i = 0; i < i_out; i ++ )
+        var_buffer_add16( p_buf, p_out[i] );
+    free( p_out );
+
+    var_buffer_add16( p_buf, 0 );
 }
 
 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;
 }
@@ -175,7 +156,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;
@@ -218,7 +198,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;
@@ -243,4 +222,3 @@ void var_buffer_getguid( var_buffer_t *p_buf, guid_t *p_guid )
         p_guid->v4[i] = var_buffer_get8( p_buf );
     }
 }
-