summaryrefslogtreecommitdiff
path: root/dselect
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2015-09-17 02:03:32 +0200
committerGuillem Jover <guillem@debian.org>2015-09-17 04:50:20 +0200
commit9a75ba2a93f349bc74fd80068bc4abc5a44f728b (patch)
treed318112ca184298e887aa3b10f849b9c35909b82 /dselect
parent21e982448e8dda1ac6c534303a8ba4f54b46127e (diff)
downloaddpkg-9a75ba2a93f349bc74fd80068bc4abc5a44f728b.tar.gz
dselect: Move sigwinch baselist member variables into setupsigwinch()
Diffstat (limited to 'dselect')
-rw-r--r--dselect/baselist.cc5
-rw-r--r--dselect/dselect.h2
2 files changed, 3 insertions, 4 deletions
diff --git a/dselect/baselist.cc b/dselect/baselist.cc
index 6c1aad9c6..ffde95ea0 100644
--- a/dselect/baselist.cc
+++ b/dselect/baselist.cc
@@ -95,8 +95,8 @@ baselist::sigwinch_mask(int how)
void
baselist::setupsigwinch()
{
- osigactp= new(struct sigaction);
- oblockedp= new(sigset_t);
+ struct sigaction *osigactp = new(struct sigaction);
+ sigset_t *oblockedp = new(sigset_t);
if (sigprocmask(0, nullptr, oblockedp))
ohshite(_("failed to get old signal mask"));
if (sigaction(SIGWINCH, nullptr, osigactp))
@@ -106,6 +106,7 @@ baselist::setupsigwinch()
sigwinch_mask(SIG_BLOCK);
+ struct sigaction nsigact;
memset(&nsigact,0,sizeof(nsigact));
nsigact.sa_handler= sigwinchhandler;
sigemptyset(&nsigact.sa_mask);
diff --git a/dselect/dselect.h b/dselect/dselect.h
index 9b95331ac..50cf8eefd 100644
--- a/dselect/dselect.h
+++ b/dselect/dselect.h
@@ -98,8 +98,6 @@ protected:
// so none of the auto-displaying update routines need to display.
// SIGWINCH handling
- struct sigaction *osigactp, nsigact;
- sigset_t *oblockedp;
void sigwinch_mask(int how);
void setupsigwinch();