Index: lib/libc/gen/getgrent.c
===================================================================
--- lib/libc/gen/getgrent.c
+++ lib/libc/gen/getgrent.c
@@ -207,23 +207,14 @@
 grp_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	gid_t gid;
 	struct group *grp;
-	char *orig_buf;
-	size_t orig_buf_size;
-
 	struct group new_grp;
 	size_t desired_size, size, mem_size;
 	char *p, **mem;
 
 	switch ((enum nss_lookup_type)cache_mdata) {
 	case nss_lt_name:
-		name = va_arg(ap, char *);
-		break;
 	case nss_lt_id:
-		gid = va_arg(ap, gid_t);
-		break;
 	case nss_lt_all:
 		break;
 	default:
@@ -232,8 +223,6 @@
 	}
 
 	grp = va_arg(ap, struct group *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
 
 	desired_size = _ALIGNBYTES + sizeof(struct group) + sizeof(char *);
 
@@ -302,8 +291,6 @@
 grp_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	gid_t gid;
 	struct group *grp;
 	char *orig_buf;
 	size_t orig_buf_size;
@@ -314,11 +301,7 @@
 
 	switch ((enum nss_lookup_type)cache_mdata) {
 	case nss_lt_name:
-		name = va_arg(ap, char *);
-		break;
 	case nss_lt_id:
-		gid = va_arg(ap, gid_t);
-		break;
 	case nss_lt_all:
 		break;
 	default:
@@ -659,14 +642,13 @@
 		NS_FALLBACK_CB(getgroupmembership_fallback)
 		{ NULL, NULL, NULL }
 	};
-	int rv;
 
 	assert(uname != NULL);
 	/* groups may be NULL if just sizing when invoked with maxgrp = 0 */
 	assert(grpcnt != NULL);
 
 	*grpcnt = 0;
-	rv = _nsdispatch(NULL, dtab, NSDB_GROUP, "getgroupmembership",
+	(void)_nsdispatch(NULL, dtab, NSDB_GROUP, "getgroupmembership",
 	    defaultsrc, uname, agroup, groups, maxgrp, grpcnt);
 
 	/* too many groups found? */
Index: lib/libc/gen/getpwent.c
===================================================================
--- lib/libc/gen/getpwent.c
+++ lib/libc/gen/getpwent.c
@@ -257,23 +257,14 @@
 pwd_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	uid_t uid;
 	struct passwd *pwd;
-	char *orig_buf;
-	size_t orig_buf_size;
-
 	struct passwd new_pwd;
 	size_t desired_size, size;
 	char *p;
 
 	switch ((enum nss_lookup_type)cache_mdata) {
 	case nss_lt_name:
-		name = va_arg(ap, char *);
-		break;
 	case nss_lt_id:
-		uid = va_arg(ap, uid_t);
-		break;
 	case nss_lt_all:
 		break;
 	default:
@@ -282,8 +273,6 @@
 	}
 
 	pwd = va_arg(ap, struct passwd *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
 
 	desired_size = sizeof(struct passwd) + sizeof(char *) +
 	    strlen(pwd->pw_name) + 1;
@@ -361,8 +350,6 @@
 pwd_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap,
     void *cache_mdata)
 {
-	char *name;
-	uid_t uid;
 	struct passwd *pwd;
 	char *orig_buf;
 	size_t orig_buf_size;
@@ -372,11 +359,7 @@
 
 	switch ((enum nss_lookup_type)cache_mdata) {
 	case nss_lt_name:
-		name = va_arg(ap, char *);
-		break;
 	case nss_lt_id:
-		uid = va_arg(ap, uid_t);
-		break;
 	case nss_lt_all:
 		break;
 	default: