diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | grp/initgroups.c | 4 | ||||
| -rw-r--r-- | nss/nsswitch.c | 2 |
3 files changed, 6 insertions, 3 deletions
@@ -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 1f349d09ad..b275bfae7a 100644 --- 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 7799281695..6cd3d81bb8 100644 --- 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; |