aboutsummaryrefslogtreecommitdiffstats
path: root/intl/explodename.c
diff options
context:
space:
mode:
authorReuben Thomas <rrt@sc3d.org>2013-12-16 02:33:24 +0000
committerReuben Thomas <rrt@sc3d.org>2013-12-16 02:33:24 +0000
commitbdc4e6f675930e28bfcb373225ef8cb4a9e47340 (patch)
tree1436629f308946bbc76624c47443bdaa1a243c0f /intl/explodename.c
parentbce3b23795023b2493226bb88c9fea1e2ee5898b (diff)
downloadplptools-bdc4e6f675930e28bfcb373225ef8cb4a9e47340.tar.gz
plptools-bdc4e6f675930e28bfcb373225ef8cb4a9e47340.tar.bz2
plptools-bdc4e6f675930e28bfcb373225ef8cb4a9e47340.zip
Make reasonably recent autotools happy; remove gettext files
Diffstat (limited to 'intl/explodename.c')
-rw-r--r--intl/explodename.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/intl/explodename.c b/intl/explodename.c
index 8d3e146..3c14886 100644
--- a/intl/explodename.c
+++ b/intl/explodename.c
@@ -1,20 +1,18 @@
-/* Copyright (C) 1995-1998, 2000-2001, 2003, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1998, 2000-2001, 2003, 2005, 2007 Free Software Foundation, Inc.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU Library General Public License as published
- by the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ This program 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.
This program 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
- Library 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 Library General Public
- License along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- USA. */
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
# include <config.h>
@@ -105,7 +103,9 @@ _nl_explode_name (char *name,
{
*normalized_codeset = _nl_normalize_codeset (*codeset,
cp - *codeset);
- if (strcmp (*codeset, *normalized_codeset) == 0)
+ if (*normalized_codeset == NULL)
+ return -1;
+ else if (strcmp (*codeset, *normalized_codeset) == 0)
free ((char *) *normalized_codeset);
else
mask |= XPG_NORM_CODESET;