]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
lib/pager: Rename caught_signal to pager_caught_signal
authorKarel Zak <kzak@redhat.com>
Mon, 16 Feb 2026 09:45:27 +0000 (10:45 +0100)
committerKarel Zak <kzak@redhat.com>
Mon, 16 Feb 2026 09:45:50 +0000 (10:45 +0100)
The variable name caught_signal is too generic. Rename it to
pager_caught_signal to follow the existing naming convention in the
file where pager-related static variables use the pager_ prefix
(pager_process, pager_argv, etc.).

Signed-off-by: Karel Zak <kzak@redhat.com>
lib/pager.c

index 98773ed2ab908f86098d0d800c8df95e6649d5eb..df8714da540e7b5c6a5ec0bdb1241cc522716b67 100644 (file)
@@ -44,7 +44,7 @@ struct child_process {
 };
 static struct child_process pager_process;
 
-static volatile sig_atomic_t caught_signal;
+static volatile sig_atomic_t pager_caught_signal;
 
 static inline void close_pair(int fd[2])
 {
@@ -114,7 +114,7 @@ static void wait_for_pager(void)
 
 static void catch_signal(int signo)
 {
-       caught_signal = signo;
+       pager_caught_signal = signo;
 }
 
 static void wait_for_pager_signal(int signo __attribute__ ((__unused__)))
@@ -298,11 +298,11 @@ void pager_close(void)
        sigaction(SIGQUIT, &pager_process.orig_sigquit, NULL);
        sigaction(SIGPIPE, &pager_process.orig_sigpipe, NULL);
 
-       if (caught_signal)
+       if (pager_caught_signal)
                exit(EXIT_FAILURE);
 
        memset(&pager_process, 0, sizeof(pager_process));
-       caught_signal = 0;
+       pager_caught_signal = 0;
 }
 
 #ifdef TEST_PROGRAM_PAGER