From: Peter Krempa <[email protected]>
Both 'sigErrors' and 'sigLastErrno' are only written to since their
inception in commit 4e00b1da8a85401652031e0125477d72bfad3502.
This was caught by clang on Fedora Rawhide:
clang -Isrc/rpc/libvirt_net_rpc_server.a.p -Isrc/rpc -I../src/rpc -Isrc/util
-I../src/util -Iinclude -I../include -Isrc -I../src -I. -I..
-I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/sysprof-6
-I/usr/include/gio-unix-2.0 -I/usr/include/libmount -I/usr/include/blkid
-I/usr/include/libxml2 -I/usr/include/tirpc -fdiagnostics-color=always
-D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu99 -O2 -g
@/builds/libvirt/libvirt/build/c-warnings.txt -fPIC -DWITH_GZFILEOP -pthread
-MD -MQ src/rpc/libvirt_net_rpc_server.a.p/virnetdaemon.c.o -MF
src/rpc/libvirt_net_rpc_server.a.p/virnetdaemon.c.o.d -o
src/rpc/libvirt_net_rpc_server.a.p/virnetdaemon.c.o -c ../src/rpc/virnetdaemon.c
../src/rpc/virnetdaemon.c:552:21: error: variable 'sigErrors' set but not used
[-Werror,-Wunused-but-set-global]
552 | static sig_atomic_t sigErrors;
| ^
../src/rpc/virnetdaemon.c:553:12: error: variable 'sigLastErrno' set but not
used [-Werror,-Wunused-but-set-global]
553 | static int sigLastErrno;
| ^
2 errors generated.
Remove the variables and code which guarded the writes to them.
Fixes: 4e00b1da8a85401652031e0125477d72bfad3502
Signed-off-by: Peter Krempa <[email protected]>
---
src/rpc/virnetdaemon.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c
index 944a832ea8..7edaa897db 100644
--- a/src/rpc/virnetdaemon.c
+++ b/src/rpc/virnetdaemon.c
@@ -549,8 +549,6 @@ virNetDaemonRemoveShutdownInhibition(virNetDaemon *dmn)
#ifndef WIN32
-static sig_atomic_t sigErrors;
-static int sigLastErrno;
static int sigWrite = -1;
static void
@@ -558,7 +556,6 @@ virNetDaemonSignalHandler(int sig, siginfo_t * siginfo,
void* context G_GNUC_UNUSED)
{
int origerrno;
- int r;
siginfo_t tmp = { 0 };
if (SA_SIGINFO)
@@ -568,11 +565,7 @@ virNetDaemonSignalHandler(int sig, siginfo_t * siginfo,
tmp.si_signo = sig;
origerrno = errno;
- r = safewrite(sigWrite, &tmp, sizeof(tmp));
- if (r == -1) {
- sigErrors++;
- sigLastErrno = errno;
- }
+ ignore_value(safewrite(sigWrite, &tmp, sizeof(tmp)));
errno = origerrno;
}
--
2.55.0
