[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#997281: Fixed Upstream



This was fixed in the xawtv4 code-base earlier this year.  The commit,
rebased on to the xawtv3 code-base, is attached.

J.
From 4bf2b3966eecad32b47472065706560f31314a92 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Date: Tue, 17 Aug 2021 10:46:22 +0200
Subject: [PATCH] Replace sys_siglist with strsignal

This is needed in order to compile with newer glibc versions.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
 console/fbtools.c | 2 +-
 console/record.c  | 2 +-
 x11/rootv.c       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/console/fbtools.c b/console/fbtools.c
index 9f876df32dac..07739ff687ec 100644
--- a/console/fbtools.c
+++ b/console/fbtools.c
@@ -520,6 +520,6 @@ fb_catch_exit_signals(void)
 
     /* cleanup */
     fb_cleanup();
-    fprintf(stderr,"Oops: %s\n",sys_siglist[termsig]);
+    fprintf(stderr,"Oops: %s\n",strsignal(termsig));
     exit(42);
 }
diff --git a/console/record.c b/console/record.c
index 685221b4b5ae..90f0c852bb08 100644
--- a/console/record.c
+++ b/console/record.c
@@ -429,7 +429,7 @@ ctrlc(int signal)
 {
     if (verbose)
 	fprintf(stderr,"\n%s - exiting\n",
-		sys_siglist[signal]);
+		strsignal(signal));
     stop = 1;
 }
 
diff --git a/x11/rootv.c b/x11/rootv.c
index 60a840641e33..4bf458b227a0 100644
--- a/x11/rootv.c
+++ b/x11/rootv.c
@@ -133,7 +133,7 @@ catch_sig(int signal)
     termsig = signal;
     if (verbose)
 	fprintf(stderr,"received signal %d [%s]\n",
-		termsig,sys_siglist[termsig]);
+		termsig,strsignal(termsig));
 }
 
 static void usage(FILE *fp)
@@ -422,7 +422,7 @@ main(int argc, char *argv[])
     }
     if (verbose && termsig)
 	fprintf(stderr,"exiting on signal %d [%s]\n",
-		termsig,sys_siglist[termsig]);
+		termsig,strsignal(termsig));
     if (do_mute && have_mute)
 	XvSetPortAttribute(dpy,port,XV_MUTE,1);
     XvStopVideo(dpy,port,win);
-- 
2.33.0

Attachment: signature.asc
Description: PGP signature


Reply to: