summaryrefslogtreecommitdiff
path: root/src/openvpn/console.h
diff options
context:
space:
mode:
authorAlberto Gonzalez Iniesta <agi@inittab.org>2016-12-27 18:25:47 +0100
committerAlberto Gonzalez Iniesta <agi@inittab.org>2016-12-27 18:25:47 +0100
commit79f3537f69e125f19f59c36aa090120a63186a54 (patch)
tree2089a3b7dac990841dbc2e4d9b2f535b82dbb0af /src/openvpn/console.h
parentf2137fedb30cb87448eb03b2f288920df6187571 (diff)
parent3a2bbdb05ca6a6996e424c9fb225cb0d53804125 (diff)
Merge tag 'upstream/2.4.0'
Upstream version 2.4.0
Diffstat (limited to 'src/openvpn/console.h')
-rw-r--r--src/openvpn/console.h28
1 files changed, 15 insertions, 13 deletions
diff --git a/src/openvpn/console.h b/src/openvpn/console.h
index ec32cf6..2c7f3e9 100644
--- a/src/openvpn/console.h
+++ b/src/openvpn/console.h
@@ -5,9 +5,9 @@
* packet encryption, packet authentication, and
* packet compression.
*
- * Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
+ * Copyright (C) 2002-2017 OpenVPN Technologies, Inc. <sales@openvpn.net>
* Copyright (C) 2014-2015 David Sommerseth <davids@redhat.com>
- * Copyright (C) 2016 David Sommerseth <davids@openvpn.net>
+ * Copyright (C) 2016-2017 David Sommerseth <davids@openvpn.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2
@@ -47,7 +47,7 @@ extern struct _query_user query_user[]; /**< Global variable, declared in conso
* Wipes all data put into all of the query_user structs
*
*/
-void query_user_clear ();
+void query_user_clear();
/**
@@ -60,9 +60,9 @@ void query_user_clear ();
* @param echo Should the user input be echoed to the user? If False, input will be masked
*
*/
-void query_user_add (char *prompt, size_t prompt_len,
- char *resp, size_t resp_len,
- bool echo);
+void query_user_add(char *prompt, size_t prompt_len,
+ char *resp, size_t resp_len,
+ bool echo);
/**
@@ -73,7 +73,7 @@ void query_user_add (char *prompt, size_t prompt_len,
*
* @return True if executing all the defined steps completed successfully
*/
-bool query_user_exec_builtin ();
+bool query_user_exec_builtin();
#if defined(ENABLE_SYSTEMD)
@@ -84,7 +84,7 @@ bool query_user_exec_builtin ();
*
* @return True if executing all the defined steps completed successfully
*/
-bool query_user_exec ();
+bool query_user_exec();
#else /* ENABLE_SYSTEMD not defined*/
/**
@@ -92,7 +92,8 @@ bool query_user_exec ();
* been enabled
*
*/
-static bool query_user_exec ()
+static bool
+query_user_exec()
{
return query_user_exec_builtin();
}
@@ -106,13 +107,14 @@ static bool query_user_exec ()
* to be called at start-up initialization of OpenVPN.
*
*/
-static inline bool query_user_SINGLE (char *prompt, size_t prompt_len,
- char *resp, size_t resp_len,
- bool echo)
+static inline bool
+query_user_SINGLE(char *prompt, size_t prompt_len,
+ char *resp, size_t resp_len,
+ bool echo)
{
query_user_clear();
query_user_add(prompt, prompt_len, resp, resp_len, echo);
return query_user_exec();
}
-#endif
+#endif /* ifndef CONSOLE_H */