* nss/nsswitch.c (__nss_next): Don't use __FUNCTION__ as literal.

	* grp/initgroups.c (internal_getgrouplist): Likewise.

diff --git a/ChangeLog b/ChangeLog
index ab50c4f242bc4c268cf70898879eb08ad0e77708..11536222c454115dff55843957bda561cef5255c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-12-16  Roland McGrath  <roland@frob.com>
 
+       * nss/nsswitch.c (__nss_next): Don't use __FUNCTION__ as literal.
+       * grp/initgroups.c (internal_getgrouplist): Likewise.
+
        * hurd/intr-msg.c (_hurd_intr_rpc_mach_msg): Add `break' after
        `default:' to silence new GCC warning.
        Rewrite cast of lvalue to silence new GCC warning.

diff --git a/grp/initgroups.c b/grp/initgroups.c
index 1f349d09ad5c292483566b2eb43d92c89deead7a..b275bfae7a0ac246f1e9d92c2329fefc49e124a5 100644 (file)
--- a/grp/initgroups.c
+++ b/grp/initgroups.c
@@ -176,7 +176,7 @@ internal_getgrouplist (const char *user, gid_t group, long int *size,
 
       /* This is really only for debugging.  */
       if (NSS_STATUS_TRYAGAIN > status || status > NSS_STATUS_RETURN)
-       __libc_fatal ("illegal status in " __FUNCTION__);
+       __libc_fatal ("illegal status in internal_getgrouplist");
 
       if (status != NSS_STATUS_SUCCESS
          && nss_next_action (nip, status) == NSS_ACTION_RETURN)
@@ -214,7 +214,7 @@ getgrouplist (const char *user, gid_t group, gid_t *groups, int *ngroups)
     }
   else
     *ngroups = result;
-      
+
   memcpy (groups, newgroups, *ngroups * sizeof (gid_t));
 
   free (newgroups);

diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 77992816957e0bcfe0356afcb6e1a9c5b1ba08c6..6cd3d81bb8a235c3ee444d55caa03101e8352f40 100644 (file)
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -178,7 +178,7 @@ __nss_next (service_user **ni, const char *fct_name, void **fctp, int status,
     {
       /* This is really only for debugging.  */
        if (NSS_STATUS_TRYAGAIN > status || status > NSS_STATUS_RETURN)
-        __libc_fatal ("illegal status in " __FUNCTION__);
+        __libc_fatal ("illegal status in __nss_next");
 
        if (nss_next_action (*ni, status) == NSS_ACTION_RETURN)
         return 1;