add_password: remove callback parameter

diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index 6192dcf61f870939d90c0bcce0fdbce6f297adae..d2f50a8b7fe826126135bf090d9534c52d053d8d 100644 (file)
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -303,7 +303,7 @@ enum vlc_module_properties
     add_string_inner( CONFIG_ITEM_STRING, name, text, longtext, advc, \
                       value )
 
-#define add_password( name, value, p_callback, text, longtext, advc ) \
+#define add_password( name, value, text, longtext, advc ) \
     add_string_inner( CONFIG_ITEM_PASSWORD, name, text, longtext, advc, \
                       value )
 

diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index 70e6a7a429df2dc5020593ea3da345f5d6a15ad2..9f6e7d6de5150660143f5cff497dfb167645f837 100644 (file)
--- a/modules/access/dvb/access.c
+++ b/modules/access/dvb/access.c
@@ -258,7 +258,7 @@ vlc_module_begin ()
                 true )
     add_string( "dvb-http-user", NULL, USER_TEXT, USER_LONGTEXT,
                 true )
-    add_password( "dvb-http-password", NULL, NULL, PASSWORD_TEXT,
+    add_password( "dvb-http-password", NULL, PASSWORD_TEXT,
                   PASSWORD_LONGTEXT, true )
     add_string( "dvb-http-acl", NULL, ACL_TEXT, ACL_LONGTEXT,
                 true )

diff --git a/modules/access/http.c b/modules/access/http.c
index 103fb47b55e3bf3593dcc4d0058bf1468c5fa545..5d5a138873a1b90e34769be33e9615203464f3a6 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -114,7 +114,7 @@ vlc_module_begin ()
 
     add_string( "http-proxy", NULL, PROXY_TEXT, PROXY_LONGTEXT,
                 false )
-    add_password( "http-proxy-pwd", NULL, NULL,
+    add_password( "http-proxy-pwd", NULL,
                   PROXY_PASS_TEXT, PROXY_PASS_LONGTEXT, false )
     add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
                  CACHING_TEXT, CACHING_LONGTEXT, true )

diff --git a/modules/access/smb.c b/modules/access/smb.c
index 6c6a5cdcfd94af460ad51396a795beb1a9019d9b..0f51e1f75588e9226e3318ef6d51f9e2b3270a5f 100644 (file)
--- a/modules/access/smb.c
+++ b/modules/access/smb.c
@@ -85,7 +85,7 @@ vlc_module_begin ()
         change_safe()
     add_string( "smb-user", NULL, USER_TEXT, USER_LONGTEXT,
                 false )
-    add_password( "smb-pwd", NULL, NULL, PASS_TEXT,
+    add_password( "smb-pwd", NULL, PASS_TEXT,
                   PASS_LONGTEXT, false )
     add_string( "smb-domain", NULL, DOMAIN_TEXT,
                 DOMAIN_LONGTEXT, false )

diff --git a/modules/access_output/http.c b/modules/access_output/http.c
index 7ec1085f058661fccb4d518bd9617d00e96e8b83..2b65fcfc1b2178913c6f23768a0844a7f8b1399f 100644 (file)
--- a/modules/access_output/http.c
+++ b/modules/access_output/http.c
@@ -100,7 +100,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_SOUT_ACO )
     add_string( SOUT_CFG_PREFIX "user", "",
                 USER_TEXT, USER_LONGTEXT, true )
-    add_password( SOUT_CFG_PREFIX "pwd", "", NULL,
+    add_password( SOUT_CFG_PREFIX "pwd", "",
                   PASS_TEXT, PASS_LONGTEXT, true )
     add_string( SOUT_CFG_PREFIX "mime", "",
                 MIME_TEXT, MIME_LONGTEXT, true )

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 415cd57995d664f7584bde25c1add5ede9a3f15d..019d36d47f3084399b077df07988c5163c87775f 100644 (file)
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -140,7 +140,7 @@ vlc_module_begin ()
         add_string( "rtsp-user", NULL, USER_TEXT,
                     USER_LONGTEXT, true )
             change_safe()
-        add_password( "rtsp-pwd", NULL, NULL, PASS_TEXT,
+        add_password( "rtsp-pwd", NULL, PASS_TEXT,
                       PASS_LONGTEXT, true )
             change_safe()
 vlc_module_end ()

diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c
index d6b8f96c7ea9d15152225c37f7c3296490de6f59..284f7598f902f5756ec3b2251f696becad796088 100644 (file)
--- a/modules/misc/audioscrobbler.c
+++ b/modules/misc/audioscrobbler.c
@@ -164,7 +164,7 @@ vlc_module_begin ()
     set_description( N_("Submission of played songs to last.fm") )
     add_string( "lastfm-username", "",
                 USERNAME_TEXT, USERNAME_LONGTEXT, false )
-    add_password( "lastfm-password", "", NULL,
+    add_password( "lastfm-password", "",
                 PASSWORD_TEXT, PASSWORD_LONGTEXT, false )
     add_string( "scrobbler-url", "post.audioscrobbler.com",
                 URL_TEXT, URL_LONGTEXT, false )

diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c
index 7297a02a2e235849aea2d5d1db08884a9830ed41..c4016dbe97d0a1803fb78737d215fd4a43d0cf43 100644 (file)
--- a/modules/misc/lua/vlc.c
+++ b/modules/misc/lua/vlc.c
@@ -116,7 +116,7 @@ vlc_module_begin ()
                         TELNETHOST_LONGTEXT, true )
             add_integer( "telnet-port", TELNETPORT_DEFAULT, NULL, TELNETPORT_TEXT,
                          TELNETPORT_LONGTEXT, true )
-            add_password( "telnet-password", TELNETPWD_DEFAULT, NULL, TELNETPWD_TEXT,
+            add_password( "telnet-password", TELNETPWD_DEFAULT, TELNETPWD_TEXT,
                           TELNETPWD_LONGTEXT, true )
 
         set_callbacks( Open_LuaIntf, Close_LuaIntf )

diff --git a/modules/misc/notify/growl_udp.c b/modules/misc/notify/growl_udp.c
index ef393682629ba269ec42c0fc6dcb358a38ef9168..bbb54af574645c112810aaadae918c410ac5d929 100644 (file)
--- a/modules/misc/notify/growl_udp.c
+++ b/modules/misc/notify/growl_udp.c
@@ -83,7 +83,7 @@ vlc_module_begin ()
 
     add_string( "growl-server", SERVER_DEFAULT,
                 SERVER_TEXT, SERVER_LONGTEXT, false )
-    add_password( "growl-password", PASS_DEFAULT, NULL,
+    add_password( "growl-password", PASS_DEFAULT,
                 PASS_TEXT, PASS_LONGTEXT, false )
     add_integer( "growl-port", 9887, NULL,
                 PORT_TEXT, PORT_LONGTEXT, true )

diff --git a/modules/stream_out/raop.c b/modules/stream_out/raop.c
index 1fd30531d13cfc64ec4f55762d206d67d20cbfd9..019dfbb993275b3248b19375095bfeab65db87a9 100644 (file)
--- a/modules/stream_out/raop.c
+++ b/modules/stream_out/raop.c
@@ -166,7 +166,7 @@ vlc_module_begin();
     set_subcategory( SUBCAT_SOUT_STREAM )
     add_string( SOUT_CFG_PREFIX "host", "",
                 HOST_TEXT, HOST_LONGTEXT, false )
-    add_password( SOUT_CFG_PREFIX "password", NULL, NULL,
+    add_password( SOUT_CFG_PREFIX "password", NULL,
                   PASSWORD_TEXT, PASSWORD_LONGTEXT, false )
     add_loadfile( SOUT_CFG_PREFIX "password-file", NULL, NULL,
               PASSWORD_FILE_TEXT, PASSWORD_FILE_LONGTEXT, false )

diff --git a/modules/video_filter/remoteosd.c b/modules/video_filter/remoteosd.c
index ebe1fa29e8b105223c85410ed9ccfb92fad0384b..a5d4d09896a684067e2d9cb625646517f812e9d7 100644 (file)
--- a/modules/video_filter/remoteosd.c
+++ b/modules/video_filter/remoteosd.c
@@ -126,7 +126,7 @@ vlc_module_begin ()
         RMTOSD_HOST_LONGTEXT, false )
     add_integer_with_range( RMTOSD_CFG "port", 20001, 1, 0xFFFF, NULL,
         RMTOSD_PORT_TEXT, RMTOSD_PORT_LONGTEXT, false )
-    add_password( RMTOSD_CFG "password", "", NULL, RMTOSD_PASSWORD_TEXT,
+    add_password( RMTOSD_CFG "password", "", RMTOSD_PASSWORD_TEXT,
         RMTOSD_PASSWORD_LONGTEXT, false )
     add_integer_with_range( RMTOSD_CFG "update", RMTOSD_UPDATE_DEFAULT,
         RMTOSD_UPDATE_MIN, RMTOSD_UPDATE_MAX, NULL, RMTOSD_UPDATE_TEXT,