cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1346?usp=email )
Change subject: init: make some functions static ...................................................................... init: make some functions static A bunch of functions are defined and used within init.c only. We can therefore drop their declaration in init.h and make them static. Change-Id: I2b5429841bcd46376241890ace50b82a291b7400 Signed-off-by: Antonio Quartulli <[email protected]> Acked-by: Frank Lichtenheld <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1346 Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg34193.html Signed-off-by: Gert Doering <[email protected]> --- M src/openvpn/init.c M src/openvpn/init.h 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 1bdaf27..8d95d5c 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -71,13 +71,13 @@ static bool do_deferred_p2p_ncp(struct context *c); -void +static void context_clear(struct context *c) { CLEAR(*c); } -void +static void context_clear_1(struct context *c) { CLEAR(c->c1); @@ -4430,32 +4430,9 @@ } /* - * Initialize a tunnel instance, handle pre and post-init - * signal settings. - */ -void -init_instance_handle_signals(struct context *c, const struct env_set *env, const unsigned int flags) -{ - pre_init_signal_catch(); - init_instance(c, env, flags); - post_init_signal_catch(); - - /* - * This is done so that signals thrown during - * initialization can bring us back to - * a management hold. - */ - if (IS_SIG(c)) - { - remap_signal(c); - uninit_management_callback(); - } -} - -/* * Initialize a tunnel instance. */ -void +static void init_instance(struct context *c, const struct env_set *env, const unsigned int flags) { const struct options *options = &c->options; @@ -4745,6 +4722,29 @@ } /* + * Initialize a tunnel instance, handle pre and post-init + * signal settings. + */ +void +init_instance_handle_signals(struct context *c, const struct env_set *env, const unsigned int flags) +{ + pre_init_signal_catch(); + init_instance(c, env, flags); + post_init_signal_catch(); + + /* + * This is done so that signals thrown during + * initialization can bring us back to + * a management hold. + */ + if (IS_SIG(c)) + { + remap_signal(c); + uninit_management_callback(); + } +} + +/* * Close a tunnel instance. */ void diff --git a/src/openvpn/init.h b/src/openvpn/init.h index e89615b..97318ec 100644 --- a/src/openvpn/init.h +++ b/src/openvpn/init.h @@ -31,10 +31,6 @@ */ #define BASE_N_EVENTS 5 -void context_clear(struct context *c); - -void context_clear_1(struct context *c); - void context_clear_2(struct context *c); void context_init_1(struct context *c); @@ -64,8 +60,6 @@ void init_instance_handle_signals(struct context *c, const struct env_set *env, const unsigned int flags); -void init_instance(struct context *c, const struct env_set *env, const unsigned int flags); - /** * Query for private key and auth-user-pass username/passwords. */ -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1346?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I2b5429841bcd46376241890ace50b82a291b7400 Gerrit-Change-Number: 1346 Gerrit-PatchSet: 2 Gerrit-Owner: ordex <[email protected]> Gerrit-Reviewer: flichtenheld <[email protected]> Gerrit-Reviewer: plaisthos <[email protected]> Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
