New upstream version 2.4.0upstream/2.4.0

1 files changed, 41 insertions, 31 deletions

diff --git a/src/openvpn/sig.h b/src/openvpn/sig.h
index 2875a4c..5783731 100644
--- a/src/openvpn/sig.h
+++ b/src/openvpn/sig.h
@@ -5,7 +5,7 @@
  *             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>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2
@@ -43,9 +43,9 @@
  */
 struct signal_info
 {
-  volatile int signal_received;
-  volatile int source;
-  const char *signal_text;
+    volatile int signal_received;
+    volatile int source;
+    const char *signal_text;
 };
 
 #define IS_SIG(c) ((c)->sig->signal_received)
@@ -54,60 +54,70 @@ struct context;
 
 extern struct signal_info siginfo_static;
 
-int parse_signal (const char *signame);
-const char *signal_name (const int sig, const bool upper);
-const char *signal_description (const int signum, const char *sigtext);
-void throw_signal (const int signum);
-void throw_signal_soft (const int signum, const char *signal_text);
+int parse_signal(const char *signame);
 
-void pre_init_signal_catch (void);
-void post_init_signal_catch (void);
-void restore_signal_state (void);
+const char *signal_name(const int sig, const bool upper);
 
-void print_signal (const struct signal_info *si, const char *title, int msglevel);
-void print_status (const struct context *c, struct status_output *so);
+const char *signal_description(const int signum, const char *sigtext);
 
-void remap_signal (struct context *c);
+void throw_signal(const int signum);
 
-void signal_restart_status (const struct signal_info *si);
+void throw_signal_soft(const int signum, const char *signal_text);
 
-bool process_signal (struct context *c);
+void pre_init_signal_catch(void);
 
-void register_signal (struct context *c, int sig, const char *text);
+void post_init_signal_catch(void);
+
+void restore_signal_state(void);
+
+void print_signal(const struct signal_info *si, const char *title, int msglevel);
+
+void print_status(const struct context *c, struct status_output *so);
+
+void remap_signal(struct context *c);
+
+void signal_restart_status(const struct signal_info *si);
+
+bool process_signal(struct context *c);
+
+void register_signal(struct context *c, int sig, const char *text);
 
 #ifdef ENABLE_OCC
-void process_explicit_exit_notification_timer_wakeup (struct context *c);
+void process_explicit_exit_notification_timer_wakeup(struct context *c);
+
 #endif
 
 #ifdef _WIN32
 
 static inline void
-get_signal (volatile int *sig)
+get_signal(volatile int *sig)
 {
-  *sig = win32_signal_get (&win32_signal);
+    *sig = win32_signal_get(&win32_signal);
 }
 
 static inline void
-halt_non_edge_triggered_signals (void)
+halt_non_edge_triggered_signals(void)
 {
-  win32_signal_close (&win32_signal);
+    win32_signal_close(&win32_signal);
 }
 
-#else
+#else  /* ifdef _WIN32 */
 
 static inline void
-get_signal (volatile int *sig)
+get_signal(volatile int *sig)
 {
-  const int i = siginfo_static.signal_received;
-  if (i)
-    *sig = i;
+    const int i = siginfo_static.signal_received;
+    if (i)
+    {
+        *sig = i;
+    }
 }
 
 static inline void
-halt_non_edge_triggered_signals (void)
+halt_non_edge_triggered_signals(void)
 {
 }
 
-#endif
+#endif /* ifdef _WIN32 */
 
-#endif
+#endif /* ifndef SIG_H */