summaryrefslogtreecommitdiff
path: root/lib/amemxfrm.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-02-07 06:57:44 +0100
committerJörg Frings-Fürst <debian@jff.email>2022-02-07 06:57:44 +0100
commit6ffaa52cf732a84c0f8259dbc9b8183960ec5c33 (patch)
treed3136c22e3e805cfc0efe78412cce905a17e0c8d /lib/amemxfrm.c
parent591cbf5878b7d4105b275585b9db1324c9dfce56 (diff)
parentaf151c593704a40e10efb28d1e3dd59a23a661f3 (diff)
Merge branch 'release/debian/1.0-1'debian/1.0-1
Diffstat (limited to 'lib/amemxfrm.c')
-rw-r--r--lib/amemxfrm.c37
1 files changed, 12 insertions, 25 deletions
diff --git a/lib/amemxfrm.c b/lib/amemxfrm.c
index 314690a..760076c 100644
--- a/lib/amemxfrm.c
+++ b/lib/amemxfrm.c
@@ -1,25 +1,16 @@
/* Locale dependent memory area transformation for comparison.
- Copyright (C) 2009-2018 Free Software Foundation, Inc.
+ Copyright (C) 2009-2022 Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2009.
- This program is free software: you can redistribute it and/or
- modify it under the terms of either:
+ This file is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
+ License, or (at your option) any later version.
- * the GNU Lesser General Public License as published by the Free
- Software Foundation; either version 3 of the License, or (at your
- option) any later version.
-
- or
-
- * the GNU General Public License as published by the Free
- Software Foundation; either version 2 of the License, or (at your
- option) any later version.
-
- or both in parallel, as here.
- This program is distributed in the hope that it will be useful,
+ This file is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. */
@@ -170,14 +161,10 @@ amemxfrm (char *s, size_t n, char *resultbuf, size_t *lengthp)
return result;
fail:
- {
- int saved_errno = errno;
- if (result != resultbuf)
- free (result);
- s[n] = orig_sentinel;
- errno = saved_errno;
- return NULL;
- }
+ if (result != resultbuf)
+ free (result);
+ s[n] = orig_sentinel;
+ return NULL;
out_of_memory_1:
if (result != resultbuf)