X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Fhttp%2Fmvar.c;h=13a5b9864256a480b3e8c1d0ba6535be786f2b4c;hb=4f9272f73089735e488f65dc973d08b4be46b798;hp=2cef899c652aff1d76df7081e4122bad8baae20f;hpb=9d5e75a7a5643a2144dc561fc246a7a3ca7e5fb0;p=vlc

diff --git a/modules/control/http/mvar.c b/modules/control/http/mvar.c
index 2cef899c65..13a5b98642 100644
--- a/modules/control/http/mvar.c
+++ b/modules/control/http/mvar.c
@@ -28,8 +28,8 @@
 
 #include "http.h"
 #include <limits.h>
-
-#include <assert.h>
+#include <errno.h>
+#include <ctype.h>
 
 /* Utility function for scandir */
 static int Filter( const char *foo )
@@ -54,7 +54,7 @@ mvar_t *mvar_New( const char *name, const char *value )
     v->value = strdup( value ? value : "" );
 
     v->i_field = 0;
-    v->field = malloc( sizeof( mvar_t * ) );
+    v->field = xmalloc( sizeof( mvar_t * ) );
     v->field[0] = NULL;
 
     return v;
@@ -77,7 +77,7 @@ void mvar_Delete( mvar_t *v )
 
 void mvar_AppendVar( mvar_t *v, mvar_t *f )
 {
-    v->field = realloc( v->field, sizeof( mvar_t * ) * ( v->i_field + 2 ) );
+    v->field = xrealloc( v->field, sizeof( mvar_t * ) * ( v->i_field + 2 ) );
     v->field[v->i_field] = f;
     v->i_field++;
 }
@@ -98,7 +98,7 @@ mvar_t *mvar_Duplicate( const mvar_t *v )
 
 void mvar_PushVar( mvar_t *v, mvar_t *f )
 {
-    v->field = realloc( v->field, sizeof( mvar_t * ) * ( v->i_field + 2 ) );
+    v->field = xrealloc( v->field, sizeof( mvar_t * ) * ( v->i_field + 2 ) );
     if( v->i_field > 0 )
     {
         memmove( &v->field[1], &v->field[0], sizeof( mvar_t * ) * v->i_field );
@@ -335,6 +335,7 @@ mvar_t *mvar_InfoSetNew( char *name, input_thread_t *p_input )
 mvar_t *mvar_ObjectSetNew( intf_thread_t *p_intf, char *psz_name,
                                const char *psz_capability )
 {
+    VLC_UNUSED(p_intf);
     mvar_t *s = mvar_New( psz_name, "set" );
     size_t i;