[vlc-commits] variables: remove useless VLC_VAR_GETTEXT parameter

[Rémi Denis-Courmont]

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

variables: remove useless VLC_VAR_GETTEXT parameter

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

 modules/control/oldrc.c                       | 6 ++----
 modules/gui/macosx/VLCMainMenu.m              | 2 +-
 modules/gui/qt/components/extended_panels.cpp | 2 +-
 modules/gui/qt/menus.cpp                      | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/modules/control/oldrc.c b/modules/control/oldrc.c
index c40cd2d72a..489261acb4 100644
--- a/modules/control/oldrc.c
+++ b/modules/control/oldrc.c
@@ -1110,8 +1110,7 @@ static int Input( vlc_object_t *p_this, char const *psz_cmd,
         }
 
         /* Get the descriptive name of the variable */
-        var_Change( p_input, psz_variable, VLC_VAR_GETTEXT,
-                     &val_name, NULL );
+        var_Change( p_input, psz_variable, VLC_VAR_GETTEXT, &val_name );
         if( !val_name.psz_string ) val_name.psz_string = strdup(psz_variable);
 
         if( newval.psz_string && *newval.psz_string )
@@ -1581,8 +1580,7 @@ static int VideoConfig( vlc_object_t *p_this, char const *psz_cmd,
         }
 
         /* Get the descriptive name of the variable */
-        var_Change( p_vout, psz_variable, VLC_VAR_GETTEXT,
-                    &val_name, NULL );
+        var_Change( p_vout, psz_variable, VLC_VAR_GETTEXT, &val_name );
         if( !val_name.psz_string ) val_name.psz_string = strdup(psz_variable);
 
         msg_rc( "+----[ %s ]", val_name.psz_string );
diff --git a/modules/gui/macosx/VLCMainMenu.m b/modules/gui/macosx/VLCMainMenu.m
index ae90a336ab..75b9b4646d 100644
--- a/modules/gui/macosx/VLCMainMenu.m
+++ b/modules/gui/macosx/VLCMainMenu.m
@@ -1399,7 +1399,7 @@
     }
 
     /* Get the descriptive name of the variable */
-    var_Change(p_object, psz_variable, VLC_VAR_GETTEXT, &text, NULL);
+    var_Change(p_object, psz_variable, VLC_VAR_GETTEXT, &text);
     [mi setTitle: _NS(text.psz_string ? text.psz_string : psz_variable)];
 
     if (i_type & VLC_VAR_HASCHOICE) {
diff --git a/modules/gui/qt/components/extended_panels.cpp b/modules/gui/qt/components/extended_panels.cpp
index cd08128ffe..c66100e0ea 100644
--- a/modules/gui/qt/components/extended_panels.cpp
+++ b/modules/gui/qt/components/extended_panels.cpp
@@ -672,7 +672,7 @@ void ExtV4l2::Refresh( void )
             vlc_value_t vartext;
             const char *psz_var = text.p_list->p_values[i].psz_string;
 
-            if( var_Change( p_obj, psz_var, VLC_VAR_GETTEXT, &vartext, NULL ) )
+            if( var_Change( p_obj, psz_var, VLC_VAR_GETTEXT, &vartext ) )
                 continue;
 
             QString name = qtr( vartext.psz_string );
diff --git a/modules/gui/qt/menus.cpp b/modules/gui/qt/menus.cpp
index 9d85e4a452..0a79fa7eef 100644
--- a/modules/gui/qt/menus.cpp
+++ b/modules/gui/qt/menus.cpp
@@ -1299,7 +1299,7 @@ void VLCMenuBar::UpdateItem( QMenu *menu,
     }
 
     /* Get the descriptive name of the variable */
-    int i_ret = var_Change( p_object, psz_var, VLC_VAR_GETTEXT, &text, NULL );
+    int i_ret = var_Change( p_object, psz_var, VLC_VAR_GETTEXT, &text );
     if( i_ret != VLC_SUCCESS )
     {
         text.psz_string = NULL;