From: Bruno Haible <bruno@clisp.org>
Date: Thu, 20 Oct 2005 17:47:15 +0000 (+0000)
Subject: Simplify code.
X-Git-Tag: v0.15~356
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c9eae8ca34a72d25e89d9ba3c1957541f3eabde;p=thirdparty%2Fgettext.git

Simplify code.
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 99a799833..c712708d1 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-09  Bruno Haible  <bruno@clisp.org>
+2002-07-24  Ulrich Drepper  <drepper@redhat.com>
+
+	* explodename.c (_nl_explode_name): Simplify.
+
 2005-10-09  Bruno Haible  <bruno@clisp.org>
 2002-07-24  Ulrich Drepper  <drepper@redhat.com>
 
diff --git a/gettext-runtime/intl/explodename.c b/gettext-runtime/intl/explodename.c
index 04f82bd44..8d3e1463d 100644
--- a/gettext-runtime/intl/explodename.c
+++ b/gettext-runtime/intl/explodename.c
@@ -119,7 +119,8 @@ _nl_explode_name (char *name,
       cp[0] = '\0';
       *modifier = ++cp;
 
-      mask |= XPG_MODIFIER;
+      if (cp[0] != '\0')
+	mask |= XPG_MODIFIER;
     }
 
   if (*territory != NULL && (*territory)[0] == '\0')
@@ -128,8 +129,5 @@ _nl_explode_name (char *name,
   if (*codeset != NULL && (*codeset)[0] == '\0')
     mask &= ~XPG_CODESET;
 
-  if (*modifier != NULL && (*modifier)[0] == '\0')
-    mask &= ~XPG_MODIFIER;
-
   return mask;
 }