From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 5 Feb 2009 19:59:54 +0000 (+0000)
Subject: * intl/dcigettext.c (DCIGETTEXT): Avoid some code duplication.
X-Git-Tag: cvs/fedora-glibc-20090218T1534~27
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52de761a93b7306f6efb002e90b89cba1fd8c5f2;p=platform%2Fupstream%2Fglibc.git

* intl/dcigettext.c (DCIGETTEXT): Avoid some code duplication.
---

diff --git a/ChangeLog b/ChangeLog
index 7b6d4dc..caafea3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2009-02-05  Ulrich Drepper  <drepper@redhat.com>
 
+	* intl/dcigettext.c (DCIGETTEXT): Avoid some code duplication.
+
 	* sysdeps/unix/opendir.c (__alloc_dir): We have a lot more memory
 	today than when the original code was written.  Use larger
 	buffers.  This also makes it unnecessary to have stat information,
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index e078244..16d901e 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the internal dcigettext function.
-   Copyright (C) 1995-2005, 2006, 2007, 2008
+   Copyright (C) 1995-2005, 2006, 2007, 2008, 2009
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -553,18 +553,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
 	}
 
       if (ret == NULL)
-	{
-	  /* We cannot get the current working directory.  Don't signal an
-	     error but simply return the default string.  */
-	  FREE_BLOCKS (block_list);
-	  __libc_rwlock_unlock (__libc_setlocale_lock);
-	  __libc_rwlock_unlock (_nl_state_lock);
-	  __set_errno (saved_errno);
-	  return (plural == 0
-		  ? (char *) msgid1
-		  /* Use the Germanic plural rule.  */
-		  : n == 1 ? (char *) msgid1 : (char *) msgid2);
-	}
+	goto no_translation;
 
       stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
     }