Prefer https to http for gnu.org and fsf.org URLs

[thirdparty/glibc.git] / stdio-common / psignal.c

diff --git a/stdio-common/psignal.c b/stdio-common/psignal.c
index 6c4e823b911b253fdceb962c55a32c317942926a..89bd1d89d44eacb3b9cc969512134a98635494cf 100644 (file)
--- a/stdio-common/psignal.c
+++ b/stdio-common/psignal.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1991, 1992, 1995, 1996, 1997, 2001, 2002, 2004, 2005
-   Free Software Foundation, Inc.
+/* Copyright (C) 1991-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -13,9 +12,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
 
 #include <stdio.h>
 #include <signal.h>
@@ -23,16 +21,6 @@
 #include <libintl.h>
 #include <wchar.h>
 
-
-#ifndef        HAVE_GNU_LD
-#define        _sys_siglist    sys_siglist
-#endif
-
-/* Defined in sys_siglist.c.  */
-extern const char *const _sys_siglist[];
-extern const char *const _sys_siglist_internal[] attribute_hidden;
-
-
 /* Print out on stderr a line consisting of the test in S, a colon, a space,
    a message describing the meaning of the signal number SIG and a newline.
    If S is NULL or "", the colon and space are omitted.  */
@@ -41,23 +29,22 @@ psignal (int sig, const char *s)
 {
   const char *colon, *desc;
 
-  if (s == NULL || s == '\0')
+  if (s == NULL || *s == '\0')
     s = colon = "";
   else
     colon = ": ";
 
-  if (sig >= 0 && sig < NSIG && (desc = INTUSE(_sys_siglist)[sig]) != NULL)
-    (void) __fxprintf (NULL, L"%s%s%s\n", "%s%s%s\n", s, colon, _(desc));
+  if (sig >= 0 && sig < NSIG && (desc = _sys_siglist[sig]) != NULL)
+    (void) __fxprintf (NULL, "%s%s%s\n", s, colon, _(desc));
   else
     {
       char *buf;
 
       if (__asprintf (&buf, _("%s%sUnknown signal %d\n"), s, colon, sig) < 0)
-       (void) __fxprintf (NULL, "%s%s%s\n", L"%s%s%s\n",
-                          s, colon, _("Unknown signal"));
+       (void) __fxprintf (NULL, "%s%s%s\n", s, colon, _("Unknown signal"));
       else
        {
-         (void) __fxprintf (NULL, L"%s", "%s", buf);
+         (void) __fxprintf (NULL, "%s", buf);
 
          free (buf);
        }