aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2014-04-09 17:26:10 +0300
committerLasse Collin <lasse.collin@tukaani.org>2014-04-26 08:47:24 +0300
commitb9f0584e3eff421eadbb6604de0b0b40bf87e129 (patch)
tree91e507f2bde47361c3ef0eda876e4ece9fb08d19
parentxz: Fix a comment. (diff)
downloadxz-b9f0584e3eff421eadbb6604de0b0b40bf87e129.tar.xz
xz: Rename a variable to avoid a namespace collision on Solaris.
I don't know the details but I have an impression that there's no problem in practice if using GCC since people have built xz with GCC (without patching xz), but renaming the variable cannot hurt either. Thanks to Mark Ashley.
-rw-r--r--src/xz/signals.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/xz/signals.c b/src/xz/signals.c
index de213644..322811f4 100644
--- a/src/xz/signals.c
+++ b/src/xz/signals.c
@@ -77,17 +77,19 @@ signals_init(void)
sigaddset(&hooked_signals, message_progress_sigs[i]);
#endif
- struct sigaction sa;
+ // Using "my_sa" because "sa" may conflict with a sockaddr variable
+ // from system headers on Solaris.
+ struct sigaction my_sa;
// All the signals that we handle we also blocked while the signal
// handler runs.
- sa.sa_mask = hooked_signals;
+ my_sa.sa_mask = hooked_signals;
// Don't set SA_RESTART, because we want EINTR so that we can check
// for user_abort and cleanup before exiting. We block the signals
// for which we have established a handler when we don't want EINTR.
- sa.sa_flags = 0;
- sa.sa_handler = &signal_handler;
+ my_sa.sa_flags = 0;
+ my_sa.sa_handler = &signal_handler;
for (size_t i = 0; i < ARRAY_SIZE(sigs); ++i) {
// If the parent process has left some signals ignored,
@@ -98,7 +100,7 @@ signals_init(void)
continue;
// Establish the signal handler.
- if (sigaction(sigs[i], &sa, NULL))
+ if (sigaction(sigs[i], &my_sa, NULL))
message_signal_handler();
}