[vlc-commits] dialog: fix dialog_Login macro (see #16404)

Thomas Guillem git at videolan.org
Mon Jan 18 16:11:58 CET 2016


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Jan 18 15:50:22 2016 +0100| [7e421dca04adcaf826c67beb102ac77372871453] | committer: Thomas Guillem

dialog: fix dialog_Login macro (see #16404)

It was not well updated when new arguments were added.

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

 include/vlc_dialog.h |    4 ++--
 src/misc/keystore.c  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/vlc_dialog.h b/include/vlc_dialog.h
index caf0a32..f682a02 100644
--- a/include/vlc_dialog.h
+++ b/include/vlc_dialog.h
@@ -80,8 +80,8 @@ typedef struct dialog_login_t
 } dialog_login_t;
 
 VLC_API void dialog_Login(vlc_object_t *, const char *, char **, char **, bool *, const char *, const char *, ...) VLC_FORMAT (7, 8);
-#define dialog_Login(o, u, p, s, t, v, ...) \
-        dialog_Login(VLC_OBJECT(o), u, p, s, t, v, __VA_ARGS__)
+#define dialog_Login(o, u, p, s, t, v, w, ...) \
+        dialog_Login(VLC_OBJECT(o), u, p, s, t, v, w, __VA_ARGS__)
 
 /**
  * A question dialog.
diff --git a/src/misc/keystore.c b/src/misc/keystore.c
index d307631..fb85619 100644
--- a/src/misc/keystore.c
+++ b/src/misc/keystore.c
@@ -403,7 +403,7 @@ vlc_credential_get(vlc_credential *p_credential, vlc_object_t *p_parent,
                          &p_credential->psz_dialog_username,
                          &p_credential->psz_dialog_password,
                          p_credential->p_keystore ? &p_credential->b_store : NULL,
-                         psz_dialog_title, psz_dialog_text);
+                         psz_dialog_title, psz_dialog_text, NULL);
             free(psz_dialog_text);
             if (p_credential->psz_dialog_username
              && p_credential->psz_dialog_password)



More information about the vlc-commits mailing list