projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xenserver: Update MD5 sums of scripts for 5.5.900-29381p
[openvswitch]
/
lib
/
fatal-signal.c
diff --git
a/lib/fatal-signal.c
b/lib/fatal-signal.c
index 60a188e6fd1f9bfecae44f627bd7de9c33756349..f6f913ebc0b1d2aa19923240344f40c88df37384 100644
(file)
--- a/
lib/fatal-signal.c
+++ b/
lib/fatal-signal.c
@@
-137,8
+137,11
@@
fatal_signal_handler(int sig_nr)
void
fatal_signal_run(void)
{
void
fatal_signal_run(void)
{
- int sig_nr
= stored_sig_nr
;
+ int sig_nr;
+ fatal_signal_init();
+
+ sig_nr = stored_sig_nr;
if (sig_nr != SIG_ATOMIC_MAX) {
call_hooks(sig_nr);
if (sig_nr != SIG_ATOMIC_MAX) {
call_hooks(sig_nr);
@@
-152,6
+155,7
@@
fatal_signal_run(void)
void
fatal_signal_wait(void)
{
void
fatal_signal_wait(void)
{
+ fatal_signal_init();
poll_fd_wait(signal_fds[0], POLLIN);
}
poll_fd_wait(signal_fds[0], POLLIN);
}
@@
-234,13
+238,13
@@
fatal_signal_unlink_file_now(const char *file)
}
static void
}
static void
-unlink_files(void *aux UNUSED)
+unlink_files(void *aux
OVS_
UNUSED)
{
do_unlink_files();
}
static void
{
do_unlink_files();
}
static void
-cancel_files(void *aux UNUSED)
+cancel_files(void *aux
OVS_
UNUSED)
{
shash_clear(&files);
added_hook = false;
{
shash_clear(&files);
added_hook = false;