aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-07-12 21:42:46 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-07-26 10:12:44 +0200
commitca7db4fcb09695b4fe1616e520ca417a4e2455fc (patch)
tree289b57ac73b360558c67fb61cdcccb581337d7a7
parent1e15760a3e59cff09f9ccc0780bca544a90a1b6b (diff)
downloadnx-libs-ca7db4fcb09695b4fe1616e520ca417a4e2455fc.tar.gz
nx-libs-ca7db4fcb09695b4fe1616e520ca417a4e2455fc.tar.bz2
nx-libs-ca7db4fcb09695b4fe1616e520ca417a4e2455fc.zip
nxcomp/src/Loop.cpp: Rename local variable 'handler' to 'signalHandler'.
-rw-r--r--nxcomp/src/Children.cpp4
-rw-r--r--nxcomp/src/Loop.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/nxcomp/src/Children.cpp b/nxcomp/src/Children.cpp
index 49ab13352..e77d1defd 100644
--- a/nxcomp/src/Children.cpp
+++ b/nxcomp/src/Children.cpp
@@ -64,7 +64,7 @@
extern Keeper *keeper;
-extern int (*handler)(int);
+extern int (*signalHandler)(int);
extern int useUnixSocket;
@@ -792,7 +792,7 @@ int NXTransKeeper(int caches, int images, const char *root)
keeper = new Keeper(caches, images, root, 100, parent);
- handler = NXTransKeeperHandler;
+ signalHandler = NXTransKeeperHandler;
if (keeper == NULL)
{
diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 6adb2453e..3dc6f4ec5 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -331,7 +331,7 @@ Keeper *keeper = NULL;
// to be notified about signals.
//
-int (*handler)(int) = NULL;
+int (*signalHandler)(int) = NULL;
//
// Signal handling functions (that are not already mentioned in Misc.h).
@@ -5999,7 +5999,7 @@ void HandleSignal(int signal)
#endif
- if (getpid() != lastProxy && handler != NULL)
+ if (getpid() != lastProxy && signalHandler != NULL)
{
#if defined(UNSAFE) && (defined(TEST) || defined(INFO))
*logofs << "Loop: Calling slave handler in process "
@@ -6007,7 +6007,7 @@ void HandleSignal(int signal)
<< logofs_flush;
#endif
- if ((*handler)(signal) == 0)
+ if ((*signalHandler)(signal) == 0)
{
return;
}