summaryrefslogtreecommitdiffstats
path: root/gl/strerror.c
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2023-02-11 06:20:24 (GMT)
committerAndreas Baumann <mail@andreasbaumann.cc>2023-02-11 06:20:24 (GMT)
commitf867d7b44080fa9716deeff4476275f9a489879f (patch)
treebc964662fc3300dc626fb6d833d8ed5c8f46eca7 /gl/strerror.c
parent9734c439cba0a02b087e50789e94ec9b07754608 (diff)
parentc07206f2ccc2356aa74bc6813a94c2190017d44e (diff)
downloadmonitoring-plugins-f867d7b44080fa9716deeff4476275f9a489879f.tar.gz
Merge branch 'master' into curlfixes
Diffstat (limited to 'gl/strerror.c')
-rw-r--r--gl/strerror.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/gl/strerror.c b/gl/strerror.c
index 80a2f2e..d754f60 100644
--- a/gl/strerror.c
+++ b/gl/strerror.c
@@ -1,19 +1,19 @@
1/* strerror.c --- POSIX compatible system error routine 1/* strerror.c --- POSIX compatible system error routine
2 2
3 Copyright (C) 2007-2013 Free Software Foundation, Inc. 3 Copyright (C) 2007-2023 Free Software Foundation, Inc.
4 4
5 This program is free software: you can redistribute it and/or modify 5 This file is free software: you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU Lesser General Public License as
7 the Free Software Foundation; either version 3 of the License, or 7 published by the Free Software Foundation; either version 2.1 of the
8 (at your option) any later version. 8 License, or (at your option) any later version.
9 9
10 This program is distributed in the hope that it will be useful, 10 This file is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 13 GNU Lesser General Public License for more details.
14 14
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU Lesser General Public License
16 along with this program. If not, see <http://www.gnu.org/licenses/>. */ 16 along with this program. If not, see <https://www.gnu.org/licenses/>. */
17 17
18#include <config.h> 18#include <config.h>
19 19
@@ -27,7 +27,6 @@
27 27
28#include "intprops.h" 28#include "intprops.h"
29#include "strerror-override.h" 29#include "strerror-override.h"
30#include "verify.h"
31 30
32/* Use the system functions, not the gnulib overrides in this file. */ 31/* Use the system functions, not the gnulib overrides in this file. */
33#undef sprintf 32#undef sprintf
@@ -55,7 +54,7 @@ strerror (int n)
55 if (!msg || !*msg) 54 if (!msg || !*msg)
56 { 55 {
57 static char const fmt[] = "Unknown error %d"; 56 static char const fmt[] = "Unknown error %d";
58 verify (sizeof buf >= sizeof (fmt) + INT_STRLEN_BOUND (n)); 57 static_assert (sizeof buf >= sizeof (fmt) + INT_STRLEN_BOUND (n));
59 sprintf (buf, fmt, n); 58 sprintf (buf, fmt, n);
60 errno = EINVAL; 59 errno = EINVAL;
61 return buf; 60 return buf;
@@ -66,5 +65,6 @@ strerror (int n)
66 if (sizeof buf <= len) 65 if (sizeof buf <= len)
67 abort (); 66 abort ();
68 67
69 return memcpy (buf, msg, len + 1); 68 memcpy (buf, msg, len + 1);
69 return buf;
70} 70}