From: Bruno Haible <bruno@clisp.org>
Date: Thu, 18 May 2006 16:58:57 +0000 (+0000)
Subject: Triviality. (Merge from glibc.)
X-Git-Tag: v0.15~124
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb9995da0d21ac171c63a322f9e4895865ddd34e;p=thirdparty%2Fgettext.git

Triviality. (Merge from glibc.)
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 1d6d4405d..0b36ec46a 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-06  Ulrich Drepper  <drepper@redhat.com>
+
+	* finddomain.c (_nl_find_domain): We never return NULL if we found the
+	locale.
+
 2005-12-21  Roland McGrath  <roland@redhat.com>
 
 	* l10nflist.c (_nl_make_l10nflist): Free ABS_FILENAME when later malloc
diff --git a/gettext-runtime/intl/finddomain.c b/gettext-runtime/intl/finddomain.c
index 237fe6ef5..9501d6941 100644
--- a/gettext-runtime/intl/finddomain.c
+++ b/gettext-runtime/intl/finddomain.c
@@ -1,5 +1,5 @@
 /* Handle list of needed message catalogs
-   Copyright (C) 1995-1999, 2000-2001, 2003-2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2001, 2003-2006 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.org>, 1995.
 
    This program is free software; you can redistribute it and/or modify it
@@ -112,7 +112,7 @@ _nl_find_domain (const char *dirname, char *locale,
 	    break;
 	}
 
-      return cnt >= 0 ? retval : NULL;
+      return retval;
       /* NOTREACHED */
     }