From: Michael Kerrisk <mtk.manpages@gmail.com>
Date: Fri, 2 Oct 2020 10:50:00 +0000 (+0200)
Subject: psignal.3, strsignal.3: Consolidate information on 'sys_siglist' in one page (strsign... 
X-Git-Tag: man-pages-5.09~200
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=317203472e5379d5730cff434b508465df2a3d04;p=thirdparty%2Fman-pages.git

psignal.3, strsignal.3: Consolidate information on 'sys_siglist' in one page (strsignal(3))

Through some accident, 'sys_siglist' has been documented in
two different pages. Consolidate the information to one page
(strsignal(3)) and add 'sys_siglist" to the NAME line of that
page.

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
---

diff --git a/man3/psignal.3 b/man3/psignal.3
index b313037b5b..dd9d7802ad 100644
--- a/man3/psignal.3
+++ b/man3/psignal.3
@@ -36,8 +36,6 @@ psignal, psiginfo \- print signal description
 .PP
 .BI "void psignal(int " sig ", const char *" s );
 .BI "void psiginfo(const siginfo_t *" pinfo ", const char *" s );
-.PP
-.BI "extern const char *const " sys_siglist [];
 .fi
 .PP
 .RS -4
@@ -53,12 +51,6 @@ Feature Test Macro Requirements for glibc (see
 .br
 .BR psiginfo ():
 _POSIX_C_SOURCE\ >=\ 200809L
-.br
-.IR sys_siglist :
-    Since glibc 2.19:
-        _DEFAULT_SOURCE
-    Glibc 2.19 and earlier:
-        _BSD_SOURCE
 .SH DESCRIPTION
 The
 .BR psignal ()
@@ -89,9 +81,6 @@ and the user ID and process ID of the sender, for signals set using
 .BR kill (2)
 or
 .BR sigqueue (3)).
-.PP
-The array \fIsys_siglist\fP holds the signal description strings
-indexed by signal number.
 .SH RETURN VALUE
 The
 .BR psignal ()
diff --git a/man3/strsignal.3 b/man3/strsignal.3
index eb7aff3c97..465e1dc0bc 100644
--- a/man3/strsignal.3
+++ b/man3/strsignal.3
@@ -29,7 +29,7 @@
 .\" Modified Sat Jul 24 17:59:03 1993 by Rik Faith (faith@cs.unc.edu)
 .TH STRSIGNAL 3  2017-09-15 "GNU" "Linux Programmer's Manual"
 .SH NAME
-strsignal \- return string describing signal
+strsignal, sys_siglist \- return string describing signal
 .SH SYNOPSIS
 .nf
 .B #include <string.h>
@@ -55,6 +55,12 @@ _POSIX_C_SOURCE\ >=\ 200809L
 Before glibc 2.10:
 _GNU_SOURCE
 .RE
+.br
+.IR sys_siglist :
+    Since glibc 2.19:
+        _DEFAULT_SOURCE
+    Glibc 2.19 and earlier:
+        _BSD_SOURCE
 .ad
 .PD
 .SH DESCRIPTION
@@ -72,8 +78,7 @@ holds the signal description strings
 indexed by signal number.
 The
 .BR strsignal ()
-function should be
-used if possible instead of this array.
+function should be used instead of this array.
 .SH RETURN VALUE
 The
 .BR strsignal ()