diff options
author | Ed Maste <emaste@freebsd.org> | 2012-06-26 14:43:54 +0000 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2012-06-26 09:31:44 -0700 |
commit | d06bac69c107c120955503a2bf2c6a598b133f71 (patch) | |
tree | 48a0a9cb4c0b9a48190d3fc1406368a2f252a6bf | |
parent | 3d5ce148f44985d8ec4bef10db81b54d3aab51f5 (diff) | |
download | openvswitch-d06bac69c107c120955503a2bf2c6a598b133f71.tar.gz |
lib: Do not assume sig_atomic_t is int.
On FreeBSD sig_atomic_t is long, which causes the comparison in
fatal_signal_run to be true when no signal has been reported.
Signed-off-by: Ed Maste <emaste@freebsd.org>
Signed-off-by: Ben Pfaff <blp@nicira.com>
-rw-r--r-- | AUTHORS | 1 | ||||
-rw-r--r-- | lib/fatal-signal.c | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -21,6 +21,7 @@ David Erickson derickso@stanford.edu David S. Miller davem@davemloft.net Devendra Naga devendra.aaru@gmail.com Dominic Curran dominic.curran@citrix.com +Ed Maste emaste at freebsd.org Edward Tomasz NapieraĆa trasz@freebsd.org Ethan Jackson ethan@nicira.com Gaetano Catalli gaetano.catalli@gmail.com diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c index fff2a7305..9130a2300 100644 --- a/lib/fatal-signal.c +++ b/lib/fatal-signal.c @@ -152,14 +152,14 @@ fatal_signal_handler(int sig_nr) void fatal_signal_run(void) { - int sig_nr; + sig_atomic_t sig_nr; fatal_signal_init(); sig_nr = stored_sig_nr; if (sig_nr != SIG_ATOMIC_MAX) { VLOG_WARN("terminating with signal %d (%s)", - sig_nr, signal_name(sig_nr)); + (int)sig_nr, signal_name(sig_nr)); call_hooks(sig_nr); /* Re-raise the signal with the default handling so that the program |