Update.

2000-02-11  Ulrich Drepper  <drepper@redhat.com>

	* locale/nl_langinfo.c: Correct return value in error case.  Don't
	set errno (PR libc/1582).

diff --git a/ChangeLog b/ChangeLog
index 6a5520f..94680b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-11  Ulrich Drepper  <drepper@redhat.com>
+
+       * locale/nl_langinfo.c: Correct return value in error case.  Don't
+       set errno (PR libc/1582).
+
 2000-02-02  Andreas Schwab  <schwab@suse.de>
 
        * malloc/Makefile (distribute): Add memprof.h.

diff --git a/locale/nl_langinfo.c b/locale/nl_langinfo.c
index 4c8e628..34772d3 100644 (file)
--- a/locale/nl_langinfo.c
+++ b/locale/nl_langinfo.c
@@ -1,5 +1,5 @@
 /* User interface for extracting locale-dependent parameters.
-   Copyright (C) 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -34,20 +34,14 @@ nl_langinfo (item)
   const struct locale_data *data;
 
   if (category < 0 || category >= LC_ALL)
-    {
-      /* Bogus category: bogus item.  */
-      __set_errno (EINVAL);
-      return NULL;
-    }
+    /* Bogus category: bogus item.  */
+    return "";
 
   data = *_nl_current[category];
 
   if (index >= data->nstrings)
-    {
-      /* Bogus index for this category: bogus item.  */
-      __set_errno (EINVAL);
-      return NULL;
-    }
+    /* Bogus index for this category: bogus item.  */
+    return "";
 
   /* Return the string for the specified item.  */
   return (char *) data->values[index].string;