[vlc-commits] config: remove advanced from add_password()
Rémi Denis-Courmont
git at videolan.org
Tue Apr 24 20:42:25 CEST 2018
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Apr 24 21:01:54 2018 +0300| [776811e9f2760ae9aa91e15641761936a9fdd031] | committer: Rémi Denis-Courmont
config: remove advanced from add_password()
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=776811e9f2760ae9aa91e15641761936a9fdd031
---
include/vlc_plugin.h | 2 +-
modules/access/dsm/access.c | 2 +-
modules/access/live555.cpp | 3 +--
modules/access/rdp.c | 2 +-
modules/access/samba.c | 2 +-
modules/access/sftp.c | 2 +-
modules/access/srt.c | 2 +-
modules/access/unc.c | 2 +-
modules/access/vnc.c | 2 +-
modules/access_output/http.c | 3 +--
modules/access_output/srt.c | 2 +-
modules/lua/vlc.c | 7 +++----
modules/misc/audioscrobbler.c | 3 +--
modules/spu/remoteosd.c | 4 ++--
modules/stream_out/rtp.c | 3 +--
src/libvlc-module.c | 3 +--
16 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index 7cfcd625b7..68fbf5a932 100644
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -370,7 +370,7 @@ VLC_METADATA_EXPORTS
#define add_string( name, value, text, longtext, advc ) \
add_string_inner(CONFIG_ITEM_STRING, name, text, longtext, value)
-#define add_password( name, value, text, longtext, advc ) \
+#define add_password(name, value, text, longtext) \
add_string_inner(CONFIG_ITEM_PASSWORD, name, text, longtext, value)
#define add_loadfile( name, value, text, longtext, advc ) \
diff --git a/modules/access/dsm/access.c b/modules/access/dsm/access.c
index af3fda1645..bd5439cf26 100644
--- a/modules/access/dsm/access.c
+++ b/modules/access/dsm/access.c
@@ -72,7 +72,7 @@ vlc_module_begin ()
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACCESS )
add_string( "smb-user", NULL, SMB_USER_TEXT, SMB_USER_LONGTEXT, false )
- add_password( "smb-pwd", NULL, SMB_PASS_TEXT, SMB_PASS_LONGTEXT, false )
+ add_password("smb-pwd", NULL, SMB_PASS_TEXT, SMB_PASS_LONGTEXT)
add_string( "smb-domain", NULL, SMB_DOMAIN_TEXT, SMB_DOMAIN_LONGTEXT, false )
add_shortcut( "smb", "cifs" )
set_callbacks( Open, Close )
diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
index cdc3741f35..2cfd388c9d 100644
--- a/modules/access/live555.cpp
+++ b/modules/access/live555.cpp
@@ -134,8 +134,7 @@ vlc_module_begin ()
add_string( "rtsp-user", NULL, USER_TEXT,
USER_LONGTEXT, true )
change_safe()
- add_password( "rtsp-pwd", NULL, PASS_TEXT,
- PASS_LONGTEXT, true )
+ add_password("rtsp-pwd", NULL, PASS_TEXT, PASS_LONGTEXT)
add_integer( "rtsp-frame-buffer-size", DEFAULT_FRAME_BUFFER_SIZE,
FRAME_BUFFER_SIZE_TEXT, FRAME_BUFFER_SIZE_LONGTEXT,
true )
diff --git a/modules/access/rdp.c b/modules/access/rdp.c
index 8ecceb60a3..8805f22646 100644
--- a/modules/access/rdp.c
+++ b/modules/access/rdp.c
@@ -91,7 +91,7 @@ vlc_module_begin()
add_string( CFG_PREFIX "user", NULL, USER_TEXT, USER_LONGTEXT, false )
change_safe()
- add_password( CFG_PREFIX "password", NULL, PASS_TEXT, PASS_LONGTEXT, false )
+ add_password(CFG_PREFIX "password", NULL, PASS_TEXT, PASS_LONGTEXT)
change_safe()
add_float( CFG_PREFIX "fps", 5, RDP_FPS, RDP_FPS_LONGTEXT, true )
diff --git a/modules/access/samba.c b/modules/access/samba.c
index 83b5204dc4..9de12308b1 100644
--- a/modules/access/samba.c
+++ b/modules/access/samba.c
@@ -371,7 +371,7 @@ vlc_module_begin()
set_category(CAT_INPUT)
set_subcategory(SUBCAT_INPUT_ACCESS)
add_string("smb-user", NULL, SMB_USER_TEXT, SMB_USER_LONGTEXT, false)
- add_password("smb-pwd", NULL, SMB_PASS_TEXT, SMB_PASS_LONGTEXT, false)
+ add_password("smb-pwd", NULL, SMB_PASS_TEXT, SMB_PASS_LONGTEXT)
add_string("smb-domain", NULL, SMB_DOMAIN_TEXT, SMB_DOMAIN_LONGTEXT, false)
add_shortcut("smb")
set_callbacks(Open, Close)
diff --git a/modules/access/sftp.c b/modules/access/sftp.c
index 1219f573a1..92bfc55a01 100644
--- a/modules/access/sftp.c
+++ b/modules/access/sftp.c
@@ -67,7 +67,7 @@ vlc_module_begin ()
set_subcategory( SUBCAT_INPUT_ACCESS )
add_integer( "sftp-port", 22, PORT_TEXT, PORT_LONGTEXT, true )
add_string( "sftp-user", NULL, USER_TEXT, USER_LONGTEXT, false )
- add_password( "sftp-pwd", NULL, PASS_TEXT, PASS_LONGTEXT, false )
+ add_password("sftp-pwd", NULL, PASS_TEXT, PASS_LONGTEXT)
add_shortcut( "sftp" )
set_callbacks( Open, Close )
vlc_module_end ()
diff --git a/modules/access/srt.c b/modules/access/srt.c
index 9f971a0572..f215f53eb8 100644
--- a/modules/access/srt.c
+++ b/modules/access/srt.c
@@ -393,7 +393,7 @@ vlc_module_begin ()
add_integer( "poll-timeout", SRT_DEFAULT_POLL_TIMEOUT,
N_("Return poll wait after timeout milliseconds (-1 = infinite)"), NULL, true )
add_integer( "latency", SRT_DEFAULT_LATENCY, N_("SRT latency (ms)"), NULL, true )
- add_password( "passphrase", "", N_("Password for stream encryption"), NULL, false )
+ add_password("passphrase", "", N_("Password for stream encryption"), NULL)
add_integer( "key-length", SRT_DEFAULT_KEY_LENGTH,
SRT_KEY_LENGTH_TEXT, SRT_KEY_LENGTH_TEXT, false )
change_integer_list( srt_key_lengths, srt_key_length_names )
diff --git a/modules/access/unc.c b/modules/access/unc.c
index c54c348577..5cfc30eae3 100644
--- a/modules/access/unc.c
+++ b/modules/access/unc.c
@@ -378,7 +378,7 @@ vlc_module_begin()
set_category(CAT_INPUT)
set_subcategory(SUBCAT_INPUT_ACCESS)
add_string("smb-user", NULL, SMB_USER_TEXT, SMB_USER_LONGTEXT, false)
- add_password("smb-pwd", NULL, SMB_PASS_TEXT, SMB_PASS_LONGTEXT, false)
+ add_password("smb-pwd", NULL, SMB_PASS_TEXT, SMB_PASS_LONGTEXT)
add_string("smb-domain", NULL, SMB_DOMAIN_TEXT, SMB_DOMAIN_LONGTEXT, false)
add_shortcut("smb")
set_callbacks(Open, Close)
diff --git a/modules/access/vnc.c b/modules/access/vnc.c
index 8f3ed54f20..9d8f3c55ce 100644
--- a/modules/access/vnc.c
+++ b/modules/access/vnc.c
@@ -84,7 +84,7 @@ vlc_module_begin()
add_string( CFG_PREFIX "user", NULL, RFB_USER, RFB_USER, false )
change_safe()
- add_password( CFG_PREFIX "password", NULL, RFB_PASSWORD, RFB_PASSWORD, false )
+ add_password(CFG_PREFIX "password", NULL, RFB_PASSWORD, RFB_PASSWORD)
change_safe()
add_loadfile( CFG_PREFIX "x509-ca", NULL, RFB_CA_TEXT, RFB_CA_LONGTEXT, true )
change_safe()
diff --git a/modules/access_output/http.c b/modules/access_output/http.c
index 38d633a0ed..78bbf88423 100644
--- a/modules/access_output/http.c
+++ b/modules/access_output/http.c
@@ -72,8 +72,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", "",
- PASS_TEXT, PASS_LONGTEXT, true )
+ add_password(SOUT_CFG_PREFIX "pwd", "", PASS_TEXT, PASS_LONGTEXT)
add_string( SOUT_CFG_PREFIX "mime", "",
MIME_TEXT, MIME_LONGTEXT, true )
add_bool( SOUT_CFG_PREFIX "metacube", false,
diff --git a/modules/access_output/srt.c b/modules/access_output/srt.c
index f76bf52302..36516a0099 100644
--- a/modules/access_output/srt.c
+++ b/modules/access_output/srt.c
@@ -443,7 +443,7 @@ vlc_module_begin()
add_integer( "poll-timeout", SRT_DEFAULT_POLL_TIMEOUT,
N_("Return poll wait after timeout milliseconds (-1 = infinite)"), NULL, true )
add_integer( "latency", SRT_DEFAULT_LATENCY, N_("SRT latency (ms)"), NULL, true )
- add_password( "passphrase", "", N_("Password for stream encryption"), NULL, false )
+ add_password("passphrase", "", N_("Password for stream encryption"), NULL)
add_integer( "key-length", SRT_DEFAULT_KEY_LENGTH,
SRT_KEY_LENGTH_TEXT, SRT_KEY_LENGTH_TEXT, false )
change_integer_list( srt_key_lengths, srt_key_length_names )
diff --git a/modules/lua/vlc.c b/modules/lua/vlc.c
index 837923c2cf..c3bb742044 100644
--- a/modules/lua/vlc.c
+++ b/modules/lua/vlc.c
@@ -95,7 +95,7 @@ vlc_module_begin ()
add_submodule ()
set_section( N_("Lua HTTP"), 0 )
- add_password ( "http-password", NULL, PASS_TEXT, PASS_LONGTEXT, false )
+ add_password("http-password", NULL, PASS_TEXT, PASS_LONGTEXT)
add_string ( "http-src", NULL, SRC_TEXT, SRC_LONGTEXT, true )
add_bool ( "http-index", false, INDEX_TEXT, INDEX_LONGTEXT, true )
set_capability( "interface", 0 )
@@ -123,9 +123,8 @@ vlc_module_begin ()
add_integer( "telnet-port", TELNETPORT_DEFAULT, TELNETPORT_TEXT,
TELNETPORT_LONGTEXT, true )
change_integer_range( 1, 65535 )
- add_password( "telnet-password", NULL, TELNETPWD_TEXT,
-
- TELNETPWD_LONGTEXT, true )
+ add_password("telnet-password", NULL, TELNETPWD_TEXT,
+ TELNETPWD_LONGTEXT)
set_capability( "interface", 0 )
set_callbacks( Open_LuaTelnet, Close_LuaIntf )
set_description( N_("Lua Telnet") )
diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c
index 133829a0e9..96796da8f9 100644
--- a/modules/misc/audioscrobbler.c
+++ b/modules/misc/audioscrobbler.c
@@ -132,8 +132,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", "",
- PASSWORD_TEXT, PASSWORD_LONGTEXT, false)
+ add_password("lastfm-password", "", PASSWORD_TEXT, PASSWORD_LONGTEXT)
add_string("scrobbler-url", "post.audioscrobbler.com",
URL_TEXT, URL_LONGTEXT, false)
set_capability("interface", 0)
diff --git a/modules/spu/remoteosd.c b/modules/spu/remoteosd.c
index fa0fc7fb05..630194226c 100644
--- a/modules/spu/remoteosd.c
+++ b/modules/spu/remoteosd.c
@@ -125,8 +125,8 @@ vlc_module_begin ()
RMTOSD_HOST_LONGTEXT, false )
add_integer_with_range( RMTOSD_CFG "port", 20001, 1, 0xFFFF,
RMTOSD_PORT_TEXT, RMTOSD_PORT_LONGTEXT, false )
- add_password( RMTOSD_CFG "password", "", RMTOSD_PASSWORD_TEXT,
- RMTOSD_PASSWORD_LONGTEXT, false )
+ add_password(RMTOSD_CFG "password", "", RMTOSD_PASSWORD_TEXT,
+ RMTOSD_PASSWORD_LONGTEXT)
add_integer_with_range( RMTOSD_CFG "update", RMTOSD_UPDATE_DEFAULT,
RMTOSD_UPDATE_MIN, RMTOSD_UPDATE_MAX, RMTOSD_UPDATE_TEXT,
RMTOSD_UPDATE_LONGTEXT, true )
diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 1cc89b8c9c..f160161012 100644
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -252,8 +252,7 @@ vlc_module_begin ()
RTSP_TIMEOUT_LONGTEXT, true )
add_string( "sout-rtsp-user", "",
RTSP_USER_TEXT, RTSP_USER_LONGTEXT, true )
- add_password( "sout-rtsp-pwd", "",
- RTSP_PASS_TEXT, RTSP_PASS_LONGTEXT, true )
+ add_password("sout-rtsp-pwd", "", RTSP_PASS_TEXT, RTSP_PASS_LONGTEXT)
vlc_module_end ()
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 13d95fcc40..200236adb0 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1815,8 +1815,7 @@ vlc_module_begin ()
#ifdef _WIN32
add_string( "http-proxy", NULL, PROXY_TEXT, PROXY_LONGTEXT,
false )
- add_password( "http-proxy-pwd", NULL,
- PROXY_PASS_TEXT, PROXY_PASS_LONGTEXT, false )
+ add_password("http-proxy-pwd", NULL, PROXY_PASS_TEXT, PROXY_PASS_LONGTEXT)
#else
add_obsolete_string( "http-proxy" )
add_obsolete_string( "http-proxy-pwd" )
More information about the vlc-commits
mailing list