1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-09-02 16:01:20 +03:00

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

This commit is contained in:
Ulrich Drepper
2009-02-05 19:59:54 +00:00
parent 62f63c47ee
commit 52de761a93
2 changed files with 4 additions and 13 deletions

View File

@@ -1,5 +1,7 @@
2009-02-05 Ulrich Drepper <drepper@redhat.com> 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 * sysdeps/unix/opendir.c (__alloc_dir): We have a lot more memory
today than when the original code was written. Use larger today than when the original code was written. Use larger
buffers. This also makes it unnecessary to have stat information, buffers. This also makes it unnecessary to have stat information,

View File

@@ -1,5 +1,5 @@
/* Implementation of the internal dcigettext function. /* 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. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@@ -553,18 +553,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
} }
if (ret == NULL) if (ret == NULL)
{ goto no_translation;
/* 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);
}
stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname); stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
} }