[vlc-commits] variables: remove useless VLC_VAR_DELCHOICE parameter

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jun  9 13:07:17 2018 +0300| [c35617c5787e55d039081a3f386c687f7fd99224] | committer: Rémi Denis-Courmont

variables: remove useless VLC_VAR_DELCHOICE parameter

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c35617c5787e55d039081a3f386c687f7fd99224
---

 modules/video_filter/postproc.c | 2 +-
 src/input/event.c               | 2 +-
 src/input/var.c                 | 2 +-
 test/src/misc/variables.c       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/video_filter/postproc.c b/modules/video_filter/postproc.c
index ece3221563..a6b058724d 100644
--- a/modules/video_filter/postproc.c
+++ b/modules/video_filter/postproc.c
@@ -202,7 +202,7 @@ static int OpenPostproc( vlc_object_t *p_this )
     var_Change( p_filter, FILTER_PREFIX "q", VLC_VAR_SETTEXT, &text, NULL );
 
     var_Get( p_filter, FILTER_PREFIX "q", &val_orig );
-    var_Change( p_filter, FILTER_PREFIX "q", VLC_VAR_DELCHOICE, &val_orig, NULL );
+    var_Change( p_filter, FILTER_PREFIX "q", VLC_VAR_DELCHOICE, &val_orig );
 
     val.psz_string = var_GetNonEmptyString( p_filter, FILTER_PREFIX "name" );
     if( val_orig.i_int )
diff --git a/src/input/event.c b/src/input/event.c
index 201c5c6fe3..052b907177 100644
--- a/src/input/event.c
+++ b/src/input/event.c
@@ -325,7 +325,7 @@ static void VarListDel( input_thread_t *p_input,
     if( i_value >= 0 )
     {
         val.i_int = i_value;
-        var_Change( p_input, psz_variable, VLC_VAR_DELCHOICE, &val, NULL );
+        var_Change( p_input, psz_variable, VLC_VAR_DELCHOICE, &val );
     }
     else
     {
diff --git a/src/input/var.c b/src/input/var.c
index 631b571c19..899499cf17 100644
--- a/src/input/var.c
+++ b/src/input/var.c
@@ -156,7 +156,7 @@ void input_ControlVarInit ( input_thread_t *p_input )
     var_Create( p_input, "program", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
     var_Get( p_input, "program", &val );
     if( val.i_int <= 0 )
-        var_Change( p_input, "program", VLC_VAR_DELCHOICE, &val, NULL );
+        var_Change( p_input, "program", VLC_VAR_DELCHOICE, &val );
     text.psz_string = _("Program");
     var_Change( p_input, "program", VLC_VAR_SETTEXT, &text, NULL );
 
diff --git a/test/src/misc/variables.c b/test/src/misc/variables.c
index 7a2704b60e..84bca5e8be 100644
--- a/test/src/misc/variables.c
+++ b/test/src/misc/variables.c
@@ -335,7 +335,7 @@ static void test_choices( libvlc_int_t *p_libvlc )
 
     assert( var_CountChoices( p_libvlc, "bla" ) == 2 );
 
-    var_Change( p_libvlc, "bla", VLC_VAR_DELCHOICE, &val, &val2 );
+    var_Change( p_libvlc, "bla", VLC_VAR_DELCHOICE, &val );
     assert( var_CountChoices( p_libvlc, "bla" ) == 1 );
 
     var_Change( p_libvlc, "bla", VLC_VAR_GETCHOICES, &val, &val2 );