MFC r291363:

Clean up trailing whitespace

9 files changed, 582 insertions, 583 deletions

diff --git a/tools/regression/lib/libc/nss/test-getaddr.c b/tools/regression/lib/libc/nss/test-getaddr.c
index aae1605..f0729ec 100644
--- a/tools/regression/lib/libc/nss/test-getaddr.c
+++ b/tools/regression/lib/libc/nss/test-getaddr.c
@@ -67,22 +67,22 @@ IMPLEMENT_TEST_DATA(addrinfo)
 IMPLEMENT_TEST_FILE_SNAPSHOT(addrinfo)
 IMPLEMENT_2PASS_TEST(addrinfo)
 
-static void 
+static void
 clone_addrinfo(struct addrinfo *dest, struct addrinfo const *src)
 {
 	assert(dest != NULL);
 	assert(src != NULL);
-	
+
 	memcpy(dest, src, sizeof(struct addrinfo));
 	if (src->ai_canonname != NULL)
 		dest->ai_canonname = strdup(src->ai_canonname);
-	
+
 	if (src->ai_addr != NULL) {
 		dest->ai_addr = (struct sockaddr *)malloc(src->ai_addrlen);
 		assert(dest->ai_addr != NULL);
 		memcpy(dest->ai_addr, src->ai_addr, src->ai_addrlen);
 	}
-	
+
 	if (src->ai_next != NULL) {
 		dest->ai_next = (struct addrinfo *)malloc(
 			sizeof(struct addrinfo));
@@ -96,7 +96,7 @@ compare_addrinfo_(struct addrinfo *ai1, struct addrinfo *ai2)
 {
 	if ((ai1 == NULL) || (ai2 == NULL))
 		return (-1);
-	
+
 	if ((ai1->ai_flags != ai2->ai_flags) ||
 	    (ai1->ai_family != ai2->ai_family) ||
 	    (ai1->ai_socktype != ai2->ai_socktype) ||
@@ -107,11 +107,11 @@ compare_addrinfo_(struct addrinfo *ai1, struct addrinfo *ai2)
 	    (((ai1->ai_canonname == NULL) || (ai2->ai_canonname == NULL)) &&
 	    (ai1->ai_canonname != ai2->ai_canonname)))
 		return (-1);
-	
-	if ((ai1->ai_canonname != NULL) && 
+
+	if ((ai1->ai_canonname != NULL) &&
 		(strcmp(ai1->ai_canonname, ai2->ai_canonname) != 0))
 		return (-1);
-		
+
 	if ((ai1->ai_addr != NULL) &&
 		(memcmp(ai1->ai_addr, ai2->ai_addr, ai1->ai_addrlen) != 0))
 		return (-1);
@@ -122,17 +122,17 @@ compare_addrinfo_(struct addrinfo *ai1, struct addrinfo *ai2)
 		return (compare_addrinfo_(ai1->ai_next, ai2->ai_next));
 }
 
-static int 
+static int
 compare_addrinfo(struct addrinfo *ai1, struct addrinfo *ai2, void *mdata)
 {
 	int rv;
-	
+
 	if (debug) {
 		printf("testing equality of 2 addrinfo structures\n");
 	}
 
 	rv = compare_addrinfo_(ai1, ai2);
-	
+
 	if (debug) {
 		if (rv == 0)
 			printf("equal\n");
@@ -142,16 +142,16 @@ compare_addrinfo(struct addrinfo *ai1, struct addrinfo *ai2, void *mdata)
 			printf("not equal\n");
 		}
 	}
-	
+
 	return (rv);
 }
 
-void 
+void
 free_addrinfo(struct addrinfo *ai)
 {
 	if (ai == NULL)
 		return;
-	
+
 	free(ai->ai_addr);
 	free(ai->ai_canonname);
 	free_addrinfo(ai->ai_next);
@@ -159,9 +159,9 @@ free_addrinfo(struct addrinfo *ai)
 
 void
 sdump_addrinfo(struct addrinfo *ai, char *buffer, size_t buflen)
-{	
+{
 	int written, i;
-	
+
 	written = snprintf(buffer, buflen, "%d %d %d %d %d ",
 		ai->ai_flags, ai->ai_family, ai->ai_socktype, ai->ai_protocol,
 		ai->ai_addrlen);
@@ -169,14 +169,14 @@ sdump_addrinfo(struct addrinfo *ai, char *buffer, size_t buflen)
 	if (written > buflen)
 		return;
 	buflen -= written;
-	
+
 	written = snprintf(buffer, buflen, "%s ",
 		ai->ai_canonname == NULL ? "(null)" : ai->ai_canonname);
 	buffer += written;
 	if (written > buflen)
 		return;
 	buflen -= written;
-	
+
 	if (ai->ai_addr == NULL) {
 		written = snprintf(buffer, buflen, "(null)");
 		buffer += written;
@@ -185,26 +185,26 @@ sdump_addrinfo(struct addrinfo *ai, char *buffer, size_t buflen)
 		buflen -= written;
 	} else {
 	    for (i = 0; i < ai->ai_addrlen; ++i ) {
-		written = snprintf(buffer, buflen, 
+		written = snprintf(buffer, buflen,
 		    i + 1 != ai->ai_addrlen ? "%d." : "%d",
 				    	((unsigned char *)ai->ai_addr)[i]);
 		    buffer += written;
 		    if (written > buflen)
 			return;
 		    buflen -= written;
-				
+
 		    if (buflen == 0)
 			return;
-	    }		
+	    }
 	}
-	
+
 	if (ai->ai_next != NULL) {
 		written = snprintf(buffer, buflen, ":");
 		buffer += written;
 		if (written > buflen)
 			return;
 		buflen -= written;
-		
+
 		sdump_addrinfo(ai->ai_next, buffer, buflen);
 	}
 }
@@ -224,12 +224,12 @@ static int
 addrinfo_read_snapshot_addr(char *addr, unsigned char *result, size_t len)
 {
 	char *s, *ps, *ts;
-	
+
 	ps = addr;
 	while ( (s = strsep(&ps, ".")) != NULL) {
 		if (len == 0)
 			return (-1);
-		
+
 		*result = (unsigned char)strtol(s, &ts, 10);
 		++result;
 		if (*ts != '\0')
@@ -265,7 +265,7 @@ addrinfo_read_snapshot_ai(struct addrinfo *ai, char *line)
 					goto fin;
 				break;
 			case 4:
-				ai->ai_addrlen = (socklen_t)strtol(s, &ts, 10);				
+				ai->ai_addrlen = (socklen_t)strtol(s, &ts, 10);
 				if (*ts != '\0')
 					goto fin;
 				break;
@@ -274,7 +274,7 @@ addrinfo_read_snapshot_ai(struct addrinfo *ai, char *line)
 					ai->ai_canonname = strdup(s);
 					assert(ai->ai_canonname != NULL);
 				}
-				break;				
+				break;
 			case 6:
 				if (strcmp(s, "(null)") != 0) {
 				    ai->ai_addr = (struct sockaddr *)malloc(
@@ -284,7 +284,7 @@ addrinfo_read_snapshot_ai(struct addrinfo *ai, char *line)
 				    rv = addrinfo_read_snapshot_addr(s,
 					(unsigned char *)ai->ai_addr,
 				    	ai->ai_addrlen);
-				    
+
 				    if (rv != 0)
 					goto fin;
 				}
@@ -294,18 +294,18 @@ addrinfo_read_snapshot_ai(struct addrinfo *ai, char *line)
 				rv = -1;
 				goto fin;
 		};
-		
+
 		++i;
 	}
 
 fin:
-	if ((i != 7) || (rv != 0)) {		
+	if ((i != 7) || (rv != 0)) {
 		free_addrinfo(ai);
 		memset(ai, 0, sizeof(struct addrinfo));
 		return (-1);
 	}
-	
-	return (0);	
+
+	return (0);
 }
 
 static int
@@ -317,33 +317,33 @@ addrinfo_read_snapshot_func(struct addrinfo *ai, char *line)
 
 	if (debug)
 		printf("1 line read from snapshot:\n%s\n", line);
-	
+
 	rv = 0;
 	i = 0;
 	ps = line;
-	
+
 	s = strsep(&ps, ":");
 	if (s == NULL)
 		return (-1);
-	
+
 	rv = addrinfo_read_snapshot_ai(ai, s);
 	if (rv != 0)
 		return (-1);
-	
+
 	ai2 = ai;
 	while ( (s = strsep(&ps, ":")) != NULL) {
 		ai2->ai_next = (struct addrinfo *)malloc(
 			sizeof(struct addrinfo));
 		assert(ai2->ai_next != NULL);
 		memset(ai2->ai_next, 0, sizeof(struct addrinfo));
-			
+
 		rv = addrinfo_read_snapshot_ai(ai2->ai_next, s);
 		if (rv != 0) {
-			free_addrinfo(ai);			
+			free_addrinfo(ai);
 			return (-1);
 		}
 
-		ai2 = ai2->ai_next;		
+		ai2 = ai2->ai_next;
 	}
 
 	return (0);
@@ -356,36 +356,36 @@ addrinfo_test_correctness(struct addrinfo *ai, void *mdata)
 		printf("testing correctness with the following data:\n");
 		dump_addrinfo(ai);
 	}
-	
+
 	if (ai == NULL)
 		goto errfin;
-	
+
 	if (!((ai->ai_family >= 0) && (ai->ai_family < AF_MAX)))
 		goto errfin;
-	
+
 	if ((ai->ai_socktype != 0) && (ai->ai_socktype != SOCK_STREAM) &&
 	    (ai->ai_socktype != SOCK_DGRAM) && (ai->ai_socktype != SOCK_RAW))
 		goto errfin;
-	
+
 	if ((ai->ai_protocol != 0) && (ai->ai_protocol != IPPROTO_UDP) &&
 	    (ai->ai_protocol != IPPROTO_TCP))
 		goto errfin;
-	
+
 	if ((ai->ai_flags & ~(AI_CANONNAME | AI_NUMERICHOST | AI_PASSIVE)) != 0)
 		goto errfin;
 
-	if ((ai->ai_addrlen != ai->ai_addr->sa_len) || 
+	if ((ai->ai_addrlen != ai->ai_addr->sa_len) ||
 	    (ai->ai_family != ai->ai_addr->sa_family))
 		goto errfin;
-	
+
 	if (debug)
 		printf("correct\n");
-	
-	return (0);	
+
+	return (0);
 errfin:
 	if (debug)
 		printf("incorrect\n");
-	
+
 	return (-1);
 }
 
@@ -393,27 +393,27 @@ static int
 addrinfo_read_hostlist_func(struct addrinfo *ai, char *line)
 {
 	struct addrinfo *result;
-	int rv;	
-	
+	int rv;
+
 	if (debug)
 		printf("resolving %s: ", line);
 	rv = getaddrinfo(line, NULL, &hints, &result);
 	if (rv == 0) {
 		if (debug)
 			printf("found\n");
-				
+
 		rv = addrinfo_test_correctness(result, NULL);
 		if (rv != 0) {
 			freeaddrinfo(result);
 			return (rv);
 		}
-	
+
 		clone_addrinfo(ai, result);
 		freeaddrinfo(result);
 	} else {
 		if (debug)
 			printf("not found\n");
-		
+
  		memset(ai, 0, sizeof(struct addrinfo));
 	}
 	return (0);
@@ -435,10 +435,10 @@ main(int argc, char **argv)
 	char *snapshot_file, *hostlist_file;
 	int rv;
 	int c;
-	
+
 	if (argc < 2)
 		usage();
-		
+
 	snapshot_file = NULL;
 	hostlist_file = NULL;
 	memset(&hints, 0, sizeof(struct addrinfo));
@@ -465,38 +465,38 @@ main(int argc, char **argv)
 		default:
 			usage();
 		}
-	
+
 	TEST_DATA_INIT(addrinfo, &td, clone_addrinfo, free_addrinfo);
 	TEST_DATA_INIT(addrinfo, &td_snap, clone_addrinfo, free_addrinfo);
-			
+
 	if (hostlist_file == NULL)
 		usage();
-	
+
 	if (access(hostlist_file, R_OK) != 0) {
 		if (debug)
 			printf("can't access the hostlist file %s\n",
 				hostlist_file);
-		
+
 		usage();
 	}
-	
+
 	if (debug)
 		printf("building host lists from %s\n", hostlist_file);
-	
+
 	rv = TEST_SNAPSHOT_FILE_READ(addrinfo, hostlist_file, &td,
 		addrinfo_read_hostlist_func);
 	if (rv != 0)
 		goto fin;
-	
+
 	if (snapshot_file != NULL) {
-		if (access(snapshot_file, W_OK | R_OK) != 0) {		
+		if (access(snapshot_file, W_OK | R_OK) != 0) {
 			if (errno == ENOENT)
 				method = TEST_BUILD_SNAPSHOT;
 			else {
 				if (debug)
 				    printf("can't access the snapshot file %s\n",
 				    snapshot_file);
-			
+
 				rv = -1;
 				goto fin;
 			}
@@ -510,7 +510,7 @@ main(int argc, char **argv)
 			}
 		}
 	}
-		
+
 	switch (method) {
 	case TEST_GETADDRINFO:
 		if (snapshot_file != NULL)
@@ -519,7 +519,7 @@ main(int argc, char **argv)
 		break;
 	case TEST_BUILD_SNAPSHOT:
 		if (snapshot_file != NULL) {
-		    rv = TEST_SNAPSHOT_FILE_WRITE(addrinfo, snapshot_file, &td, 
+		    rv = TEST_SNAPSHOT_FILE_WRITE(addrinfo, snapshot_file, &td,
 			sdump_addrinfo);
 		}
 		break;
diff --git a/tools/regression/lib/libc/nss/test-getgr.c b/tools/regression/lib/libc/nss/test-getgr.c
index 322c636..0ccebae 100644
--- a/tools/regression/lib/libc/nss/test-getgr.c
+++ b/tools/regression/lib/libc/nss/test-getgr.c
@@ -63,14 +63,14 @@ static void free_group(struct group *);
 static void sdump_group(struct group *, char *, size_t);
 static int group_read_snapshot_func(struct group *, char *);
 
-static int group_check_ambiguity(struct group_test_data *, 
+static int group_check_ambiguity(struct group_test_data *,
 	struct group *);
 static int group_fill_test_data(struct group_test_data *);
 static int group_test_correctness(struct group *, void *);
 static int group_test_getgrnam(struct group *, void *);
 static int group_test_getgrgid(struct group *, void *);
 static int group_test_getgrent(struct group *, void *);
-	
+
 static void usage(void)  __attribute__((__noreturn__));
 
 IMPLEMENT_TEST_DATA(group)
@@ -83,33 +83,33 @@ clone_group(struct group *dest, struct group const *src)
 {
 	assert(dest != NULL);
 	assert(src != NULL);
-	
+
 	char **cp;
 	int members_num;
-		
+
 	memset(dest, 0, sizeof(struct group));
-	
+
 	if (src->gr_name != NULL) {
 		dest->gr_name = strdup(src->gr_name);
 		assert(dest->gr_name != NULL);
 	}
-	
+
 	if (src->gr_passwd != NULL) {
 		dest->gr_passwd = strdup(src->gr_passwd);
 		assert(dest->gr_passwd != NULL);
 	}
 	dest->gr_gid = src->gr_gid;
-	
+
 	if (src->gr_mem != NULL) {
 		members_num = 0;
 		for (cp = src->gr_mem; *cp; ++cp)
 			++members_num;
-	
+
 		dest->gr_mem = (char **)malloc(
 			(members_num + 1) * (sizeof(char *)));
 		assert(dest->gr_mem != NULL);
 		memset(dest->gr_mem, 0, (members_num+1) * (sizeof(char *)));
-	
+
 		for (cp = src->gr_mem; *cp; ++cp) {
 			dest->gr_mem[cp - src->gr_mem] = strdup(*cp);
 			assert(dest->gr_mem[cp - src->gr_mem] != NULL);
@@ -117,52 +117,52 @@ clone_group(struct group *dest, struct group const *src)
 	}
 }
 
-static void 
+static void
 free_group(struct group *grp)
 {
 	char **cp;
-	
+
 	assert(grp != NULL);
-	
+
 	free(grp->gr_name);
 	free(grp->gr_passwd);
-	
+
 	for (cp = grp->gr_mem; *cp; ++cp)
 		free(*cp);
 	free(grp->gr_mem);
 }
 
-static  int 
+static  int
 compare_group(struct group *grp1, struct group *grp2, void *mdata)
 {
 	char **c1, **c2;
-        
+
 	if (grp1 == grp2)
 		return (0);
-        
+
 	if ((grp1 == NULL) || (grp2 == NULL))
 		goto errfin;
-        
+
 	if ((strcmp(grp1->gr_name, grp2->gr_name) != 0) ||
 		(strcmp(grp1->gr_passwd, grp2->gr_passwd) != 0) ||
 		(grp1->gr_gid != grp2->gr_gid))
 			goto errfin;
-        
+
 	c1 = grp1->gr_mem;
 	c2 = grp2->gr_mem;
-	
+
 	if ((grp1->gr_mem == NULL) || (grp2->gr_mem == NULL))
 		goto errfin;
-	
+
 	for (;*c1 && *c2; ++c1, ++c2)
 		if (strcmp(*c1, *c2) != 0)
 			goto errfin;
-                
+
 	if ((*c1 != '\0') || (*c2 != '\0'))
 		goto errfin;
-        
+
 	return 0;
-	
+
 errfin:
 	if ((debug) && (mdata == NULL)) {
 		printf("following structures are not equal:\n");
@@ -178,14 +178,14 @@ sdump_group(struct group *grp, char *buffer, size_t buflen)
 {
 	char **cp;
 	int written;
-	
+
 	written = snprintf(buffer, buflen, "%s %s %d",
-		grp->gr_name, grp->gr_passwd, grp->gr_gid);	
+		grp->gr_name, grp->gr_passwd, grp->gr_gid);
 	buffer += written;
 	if (written > buflen)
 		return;
 	buflen -= written;
-			
+
 	if (grp->gr_mem != NULL) {
 		if (*(grp->gr_mem) != '\0') {
 			for (cp = grp->gr_mem; *cp; ++cp) {
@@ -194,9 +194,9 @@ sdump_group(struct group *grp, char *buffer, size_t buflen)
 				if (written > buflen)
 					return;
 				buflen -= written;
-				
+
 				if (buflen == 0)
-					return;				
+					return;
 			}
 		} else
 			snprintf(buffer, buflen, " nomem");
@@ -213,7 +213,7 @@ group_read_snapshot_func(struct group *grp, char *line)
 
 	if (debug)
 		printf("1 line read from snapshot:\n%s\n", line);
-	
+
 	i = 0;
 	sl = NULL;
 	ps = line;
@@ -243,10 +243,10 @@ group_read_snapshot_func(struct group *grp, char *line)
 				if (sl == NULL) {
 					if (strcmp(s, "(null)") == 0)
 						return (0);
-										
+
 					sl = sl_init();
 					assert(sl != NULL);
-					
+
 					if (strcmp(s, "nomem") != 0) {
 						ts = strdup(s);
 						assert(ts != NULL);
@@ -257,7 +257,7 @@ group_read_snapshot_func(struct group *grp, char *line)
 					assert(ts != NULL);
 					sl_add(sl, ts);
 				}
-			break;			
+			break;
 		};
 		++i;
 	}
@@ -268,16 +268,16 @@ group_read_snapshot_func(struct group *grp, char *line)
 		memset(grp, 0, sizeof(struct group));
 		return (-1);
 	}
-	
+
 	sl_add(sl, NULL);
 	grp->gr_mem = sl->sl_str;
 
 	/* NOTE: is it a dirty hack or not? */
-	free(sl);	
+	free(sl);
 	return (0);
 }
 
-static void 
+static void
 dump_group(struct group *result)
 {
 	if (result != NULL) {
@@ -292,7 +292,7 @@ static int
 group_fill_test_data(struct group_test_data *td)
 {
 	struct group *grp;
-		
+
 	setgroupent(1);
 	while ((grp = getgrent()) != NULL) {
 		if (group_test_correctness(grp, NULL) == 0)
@@ -301,7 +301,7 @@ group_fill_test_data(struct group_test_data *td)
 			return (-1);
 	}
 	endgrent();
-	
+
 	return (0);
 }
 
@@ -312,37 +312,37 @@ group_test_correctness(struct group *grp, void *mdata)
 		printf("testing correctness with the following data:\n");
 		dump_group(grp);
 	}
-	
+
 	if (grp == NULL)
 		goto errfin;
-	
+
 	if (grp->gr_name == NULL)
 		goto errfin;
-	
+
 	if (grp->gr_passwd == NULL)
 		goto errfin;
-	
+
 	if (grp->gr_mem == NULL)
 		goto errfin;
-	
+
 	if (debug)
 		printf("correct\n");
-	
-	return (0);	
+
+	return (0);
 errfin:
 	if (debug)
 		printf("incorrect\n");
-	
+
 	return (-1);
 }
 
 /* group_check_ambiguity() is needed here because when doing the getgrent()
- * calls sequence, records from different nsswitch sources can be different, 
+ * calls sequence, records from different nsswitch sources can be different,
  * though having the same pw_name/pw_uid */
 static int
 group_check_ambiguity(struct group_test_data *td, struct group *pwd)
 {
-	
+
 	return (TEST_DATA_FIND(group, td, pwd, compare_group,
 		NULL) != NULL ? 0 : -1);
 }
@@ -351,7 +351,7 @@ static int
 group_test_getgrnam(struct group *grp_model, void *mdata)
 {
 	struct group *grp;
-		
+
 	if (debug) {
 		printf("testing getgrnam() with the following data:\n");
 		dump_group(grp_model);
@@ -360,20 +360,20 @@ group_test_getgrnam(struct group *grp_model, void *mdata)
 	grp = getgrnam(grp_model->gr_name);
 	if (group_test_correctness(grp, NULL) != 0)
 		goto errfin;
-	
+
 	if ((compare_group(grp, grp_model, NULL) != 0) &&
-	    (group_check_ambiguity((struct group_test_data *)mdata, grp) 
+	    (group_check_ambiguity((struct group_test_data *)mdata, grp)
 	    !=0))
 	    goto errfin;
-		
+
 	if (debug)
 		printf("ok\n");
 	return (0);
-	
+
 errfin:
 	if (debug)
 		printf("not ok\n");
-	
+
 	return (-1);
 }
 
@@ -381,14 +381,14 @@ static int
 group_test_getgrgid(struct group *grp_model, void *mdata)
 {
 	struct group *grp;
-		
+
 	if (debug) {
 		printf("testing getgrgid() with the following data...\n");
 		dump_group(grp_model);
-	}	
-	
+	}
+
 	grp = getgrgid(grp_model->gr_gid);
-	if ((group_test_correctness(grp, NULL) != 0) || 
+	if ((group_test_correctness(grp, NULL) != 0) ||
 	    ((compare_group(grp, grp_model, NULL) != 0) &&
 	    (group_check_ambiguity((struct group_test_data *)mdata, grp)
 	    != 0))) {
@@ -402,7 +402,7 @@ group_test_getgrgid(struct group *grp_model, void *mdata)
 	}
 }
 
-static int 
+static int
 group_test_getgrent(struct group *grp, void *mdata)
 {
 	/* Only correctness can be checked when doing 1-pass test for
@@ -426,10 +426,10 @@ main(int argc, char **argv)
 	char *snapshot_file;
 	int rv;
 	int c;
-	
+
 	if (argc < 2)
 		usage();
-		
+
 	snapshot_file = NULL;
 	while ((c = getopt(argc, argv, "nge2ds:")) != -1)
 		switch (c) {
@@ -454,18 +454,18 @@ main(int argc, char **argv)
 		default:
 			usage();
 		}
-	
+
 	TEST_DATA_INIT(group, &td, clone_group, free_group);
 	TEST_DATA_INIT(group, &td_snap, clone_group, free_group);
 	if (snapshot_file != NULL) {
-		if (access(snapshot_file, W_OK | R_OK) != 0) {		
+		if (access(snapshot_file, W_OK | R_OK) != 0) {
 			if (errno == ENOENT)
 				method = TEST_BUILD_SNAPSHOT;
 			else {
 				if (debug)
 					printf("can't access the file %s\n",
 				snapshot_file);
-			
+
 				rv = -1;
 				goto fin;
 			}
@@ -474,12 +474,12 @@ main(int argc, char **argv)
 				rv = 0;
 				goto fin;
 			}
-			
+
 			TEST_SNAPSHOT_FILE_READ(group, snapshot_file,
 				&td_snap, group_read_snapshot_func);
 		}
 	}
-		
+
 	rv = group_fill_test_data(&td);
 	if (rv == -1)
 		return (-1);
@@ -489,7 +489,7 @@ main(int argc, char **argv)
 			rv = DO_1PASS_TEST(group, &td,
 				group_test_getgrnam, (void *)&td);
 		else
-			rv = DO_1PASS_TEST(group, &td_snap, 
+			rv = DO_1PASS_TEST(group, &td_snap,
 				group_test_getgrnam, (void *)&td_snap);
 		break;
 	case TEST_GETGRGID:
@@ -497,7 +497,7 @@ main(int argc, char **argv)
 			rv = DO_1PASS_TEST(group, &td,
 				group_test_getgrgid, (void *)&td);
 		else
-			rv = DO_1PASS_TEST(group, &td_snap, 
+			rv = DO_1PASS_TEST(group, &td_snap,
 				group_test_getgrgid, (void *)&td_snap);
 		break;
 	case TEST_GETGRENT:
@@ -510,7 +510,7 @@ main(int argc, char **argv)
 		break;
 	case TEST_GETGRENT_2PASS:
 			TEST_DATA_INIT(group, &td_2pass, clone_group, free_group);
-			rv = group_fill_test_data(&td_2pass);			
+			rv = group_fill_test_data(&td_2pass);
 			if (rv != -1)
 				rv = DO_2PASS_TEST(group, &td, &td_2pass,
 					compare_group, NULL);
@@ -518,7 +518,7 @@ main(int argc, char **argv)
 		break;
 	case TEST_BUILD_SNAPSHOT:
 		if (snapshot_file != NULL)
-		    rv = TEST_SNAPSHOT_FILE_WRITE(group, snapshot_file, &td, 
+		    rv = TEST_SNAPSHOT_FILE_WRITE(group, snapshot_file, &td,
 			sdump_group);
 		break;
 	default:
@@ -529,6 +529,6 @@ main(int argc, char **argv)
 fin:
 	TEST_DATA_DESTROY(group, &td_snap);
 	TEST_DATA_DESTROY(group, &td);
-	free(snapshot_file);	
+	free(snapshot_file);
 	return (rv);
 }
diff --git a/tools/regression/lib/libc/nss/test-gethostby.c b/tools/regression/lib/libc/nss/test-gethostby.c
index 77455e7..c6cacc0 100644
--- a/tools/regression/lib/libc/nss/test-gethostby.c
+++ b/tools/regression/lib/libc/nss/test-gethostby.c
@@ -90,7 +90,7 @@ static int hostent_test_correctness(struct hostent *, void *);
 static int hostent_test_gethostbyaddr(struct hostent *, void *);
 static int hostent_test_getaddrinfo_eq(struct hostent *, void *);
 static int hostent_test_getnameinfo_eq(struct hostent *, void *);
-	
+
 static void usage(void)  __attribute__((__noreturn__));
 
 IMPLEMENT_TEST_DATA(hostent)
@@ -103,7 +103,7 @@ __gethostbyname2(const char *name, int af)
 {
 	struct hostent *he;
 	int error;
-	
+
 	if (use_ipnode_functions == 0)
 		he = gethostbyname2(name, af);
 	else {
@@ -112,7 +112,7 @@ __gethostbyname2(const char *name, int af)
 		if (he == NULL);
 			errno = error;
 	}
-	
+
 	return (he);
 }
 
@@ -121,7 +121,7 @@ __gethostbyaddr(const void *addr, socklen_t len, int af)
 {
 	struct hostent *he;
 	int error;
-	
+
 	if (use_ipnode_functions == 0)
 		he = gethostbyaddr(addr, len, af);
 	else {
@@ -130,8 +130,8 @@ __gethostbyaddr(const void *addr, socklen_t len, int af)
 		if (he == NULL)
 			errno = error;
 	}
-	
-	return (he);		
+
+	return (he);
 }
 
 static void
@@ -147,44 +147,44 @@ clone_hostent(struct hostent *dest, struct hostent const *src)
 {
 	assert(dest != NULL);
 	assert(src != NULL);
-	
+
 	char **cp;
 	int aliases_num;
 	int addrs_num;
 	size_t offset;
-		
+
 	memset(dest, 0, sizeof(struct hostent));
-	
+
 	if (src->h_name != NULL) {
 		dest->h_name = strdup(src->h_name);
 		assert(dest->h_name != NULL);
 	}
-	
+
 	dest->h_addrtype = src->h_addrtype;
 	dest->h_length = src->h_length;
-	
+
 	if (src->h_aliases != NULL) {
 		aliases_num = 0;
 		for (cp = src->h_aliases; *cp; ++cp)
 			++aliases_num;
-	
+
 		dest->h_aliases = (char **)malloc((aliases_num + 1) *
 			(sizeof(char *)));
 		assert(dest->h_aliases != NULL);
 		memset(dest->h_aliases, 0, (aliases_num + 1) *
 			(sizeof(char *)));
-	
+
 		for (cp = src->h_aliases; *cp; ++cp) {
 			dest->h_aliases[cp - src->h_aliases] = strdup(*cp);
 			assert(dest->h_aliases[cp - src->h_aliases] != NULL);
 		}
 	}
-	
+
 	if (src->h_addr_list != NULL) {
 		addrs_num = 0;
 		for (cp = src->h_addr_list; *cp; ++cp)
 			++addrs_num;
-		
+
 		dest->h_addr_list = (char **)malloc((addrs_num + 1) *
 			(sizeof(char *)));
 		assert(dest->h_addr_list != NULL);
@@ -193,7 +193,7 @@ clone_hostent(struct hostent *dest, struct hostent const *src)
 
 		for (cp = src->h_addr_list; *cp; ++cp) {
 			offset = cp - src->h_addr_list;
-			dest->h_addr_list[offset] = 
+			dest->h_addr_list[offset] =
 				(char *)malloc(src->h_length);
 			assert(dest->h_addr_list[offset] != NULL);
 			memcpy(dest->h_addr_list[offset],
@@ -202,15 +202,15 @@ clone_hostent(struct hostent *dest, struct hostent const *src)
 	}
 }
 
-static void 
+static void
 free_hostent(struct hostent *ht)
 {
 	char **cp;
-	
+
 	assert(ht != NULL);
-	
+
 	free(ht->h_name);
-	
+
 	if (ht->h_aliases != NULL) {
 		for (cp = ht->h_aliases; *cp; ++cp)
 			free(*cp);
@@ -224,33 +224,33 @@ free_hostent(struct hostent *ht)
 	}
 }
 
-static  int 
+static  int
 compare_hostent(struct hostent *ht1, struct hostent *ht2, void *mdata)
 {
 	char **c1, **c2, **ct, **cb;
 	int b;
-        
+
 	if (ht1 == ht2)
 		return 0;
-        
+
 	if ((ht1 == NULL) || (ht2 == NULL))
 		goto errfin;
-	
+
 	if ((ht1->h_name == NULL) || (ht2->h_name == NULL))
 		goto errfin;
-        
+
 	if ((ht1->h_addrtype != ht2->h_addrtype) ||
-		(ht1->h_length != ht2->h_length) || 
+		(ht1->h_length != ht2->h_length) ||
 		(strcmp(ht1->h_name, ht2->h_name) != 0))
 			goto errfin;
-        
+
 	c1 = ht1->h_aliases;
 	c2 = ht2->h_aliases;
-	
+
 	if (((ht1->h_aliases == NULL) || (ht2->h_aliases == NULL)) &&
 		(ht1->h_aliases != ht2->h_aliases))
 		goto errfin;
-	
+
 	if ((c1 != NULL) && (c2 != NULL)) {
 		cb = c1;
 		for (;*c1; ++c1) {
@@ -286,14 +286,14 @@ compare_hostent(struct hostent *ht1, struct hostent *ht2, void *mdata)
 			}
 		}
 	}
-        
+
 	c1 = ht1->h_addr_list;
 	c2 = ht2->h_addr_list;
-	
+
 	if (((ht1->h_addr_list == NULL) || (ht2->h_addr_list== NULL)) &&
 		(ht1->h_addr_list != ht2->h_addr_list))
 		goto errfin;
-	
+
 	if ((c1 != NULL) && (c2 != NULL)) {
 		cb = c1;
 		for (;*c1; ++c1) {
@@ -311,7 +311,7 @@ compare_hostent(struct hostent *ht1, struct hostent *ht2, void *mdata)
 				goto errfin;
 			}
 		}
-		
+
 		c1 = cb;
 		for (;*c2; ++c2) {
 			b = 0;
@@ -331,7 +331,7 @@ compare_hostent(struct hostent *ht1, struct hostent *ht2, void *mdata)
 	}
 
 	return 0;
-	
+
 errfin:
 	if ((debug) && (mdata == NULL)) {
 		printf("following structures are not equal:\n");
@@ -346,28 +346,28 @@ static int
 check_addrinfo_for_name(struct addrinfo *ai, char const *name)
 {
 	struct addrinfo *ai2;
-	
+
 	for (ai2 = ai; ai2 != NULL; ai2 = ai2->ai_next) {
 		if (strcmp(ai2->ai_canonname, name) == 0)
 			return (0);
 	}
-		
+
 	return (-1);
 }
 
 static int
-check_addrinfo_for_addr(struct addrinfo *ai, char const *addr, 
+check_addrinfo_for_addr(struct addrinfo *ai, char const *addr,
 	socklen_t addrlen, int af)
 {
 	struct addrinfo *ai2;
-	
+
 	for (ai2 = ai; ai2 != NULL; ai2 = ai2->ai_next) {
 		if (af != ai2->ai_family)
 			continue;
-				
+
 		switch (af) {
 			case AF_INET:
-				if (memcmp(addr, 
+				if (memcmp(addr,
 				    (void *)&((struct sockaddr_in *)ai2->ai_addr)->sin_addr,
 				    min(addrlen, ai2->ai_addrlen)) == 0)
 				    return (0);
@@ -382,24 +382,24 @@ check_addrinfo_for_addr(struct addrinfo *ai, char const *addr,
 			break;
 		}
 	}
-	
+
 	return (-1);
 }
 
-static int 
+static int
 is_hostent_equal(struct hostent *he, struct addrinfo *ai)
 {
 	char **cp;
 	int rv;
-	
+
 	if (debug)
 		printf("checking equality of he and ai\n");
-	
+
 	rv = check_addrinfo_for_name(ai, he->h_name);
 	if (rv != 0) {
 		if (debug)
 			printf("not equal - he->h_name couldn't be found\n");
-		
+
 		return (rv);
 	}
 
@@ -409,14 +409,14 @@ is_hostent_equal(struct hostent *he, struct addrinfo *ai)
 		if (rv != 0) {
 			if (debug)
 				printf("not equal - one of he->h_addr_list couldn't be found\n");
-			
+
 			return (rv);
 		}
 	}
-	
+
 	if (debug)
 		printf("equal\n");
-	
+
 	return (0);
 }
 
@@ -426,14 +426,14 @@ sdump_hostent(struct hostent *ht, char *buffer, size_t buflen)
 	char **cp;
 	size_t i;
 	int written;
-	
+
 	written = snprintf(buffer, buflen, "%s %d %d",
 		ht->h_name, ht->h_addrtype, ht->h_length);
 	buffer += written;
 	if (written > buflen)
 		return;
 	buflen -= written;
-			
+
 	if (ht->h_aliases != NULL) {
 		if (*(ht->h_aliases) != NULL) {
 			for (cp = ht->h_aliases; *cp; ++cp) {
@@ -442,53 +442,53 @@ sdump_hostent(struct hostent *ht, char *buffer, size_t buflen)
 				if (written > buflen)
 					return;
 				buflen -= written;
-				
+
 				if (buflen == 0)
-					return;				
+					return;
 			}
 		} else {
 			written = snprintf(buffer, buflen, " noaliases");
 			buffer += written;
 			if (written > buflen)
 				return;
-			buflen -= written;			
+			buflen -= written;
 		}
 	} else {
 		written = snprintf(buffer, buflen, " (null)");
 		buffer += written;
 		if (written > buflen)
 			return;
-		buflen -= written;			
+		buflen -= written;
 	}
-	
+
 	written = snprintf(buffer, buflen, " : ");
 	buffer += written;
 	if (written > buflen)
 		return;
-	buflen -= written;			
+	buflen -= written;
 
 	if (ht->h_addr_list != NULL) {
 		if (*(ht->h_addr_list) != NULL) {
 			for (cp = ht->h_addr_list; *cp; ++cp) {
 			    for (i = 0; i < ht->h_length; ++i ) {
-				written = snprintf(buffer, buflen, 
+				written = snprintf(buffer, buflen,
 				    	i + 1 != ht->h_length ? "%d." : "%d",
 				    	(unsigned char)(*cp)[i]);
 				buffer += written;
 				if (written > buflen)
 					return;
 				buflen -= written;
-				
+
 				if (buflen == 0)
 					return;
 			    }
-			    
+
 			    if (*(cp + 1) ) {
 				written = snprintf(buffer, buflen, " ");
 				buffer += written;
 				if (written > buflen)
 				    return;
-				buflen -= written;						    
+				buflen -= written;
 			    }
 			}
 		} else {
@@ -496,42 +496,42 @@ sdump_hostent(struct hostent *ht, char *buffer, size_t buflen)
 			buffer += written;
 			if (written > buflen)
 				return;
-			buflen -= written;			
+			buflen -= written;
 		}
 	} else {
 		written = snprintf(buffer, buflen, " (null)");
 		buffer += written;
 		if (written > buflen)
 			return;
-		buflen -= written;			
-	}		
+		buflen -= written;
+	}
 }
 
 static int
 hostent_read_hostlist_func(struct hostent *he, char *line)
 {
 	struct hostent *result;
-	int rv;	
-	
+	int rv;
+
 	if (debug)
 		printf("resolving %s: ", line);
 	result = __gethostbyname2(line, af_type);
 	if (result != NULL) {
 		if (debug)
 			printf("found\n");
-				
+
 		rv = hostent_test_correctness(result, NULL);
 		if (rv != 0) {
 			__freehostent(result);
 			return (rv);
 		}
-	
+
 		clone_hostent(he, result);
 		__freehostent(result);
 	} else {
 		if (debug)
 			printf("not found\n");
-		
+
  		memset(he, 0, sizeof(struct hostent));
 		he->h_name = strdup(line);
 		assert(he->h_name != NULL);
@@ -543,12 +543,12 @@ static int
 hostent_read_snapshot_addr(char *addr, unsigned char *result, size_t len)
 {
 	char *s, *ps, *ts;
-	
+
 	ps = addr;
 	while ( (s = strsep(&ps, ".")) != NULL) {
 		if (len == 0)
 			return (-1);
-		
+
 		*result = (unsigned char)strtol(s, &ts, 10);
 		++result;
 		if (*ts != '\0')
@@ -571,7 +571,7 @@ hostent_read_snapshot_func(struct hostent *ht, char *line)
 
 	if (debug)
 		printf("1 line read from snapshot:\n%s\n", line);
-	
+
 	rv = 0;
 	i = 0;
 	sl1 = sl2 = NULL;
@@ -595,15 +595,15 @@ hostent_read_snapshot_func(struct hostent *ht, char *line)
 				if (*ts != '\0')
 					goto fin;
 			break;
-				
+
 			case 3:
 				if (sl1 == NULL) {
 					if (strcmp(s, "(null)") == 0)
 						return (0);
-										
+
 					sl1 = sl_init();
 					assert(sl1 != NULL);
-									
+
 					if (strcmp(s, "noaliases") != 0) {
 						ts = strdup(s);
 						assert(ts != NULL);
@@ -618,16 +618,16 @@ hostent_read_snapshot_func(struct hostent *ht, char *line)
 						sl_add(sl1, ts);
 					}
 				}
-			break;		
+			break;
 
 			case 4:
 				if (sl2 == NULL) {
 					if (strcmp(s, "(null)") == 0)
 						return (0);
-										
+
 					sl2 = sl_init();
 					assert(sl2 != NULL);
-									
+
 					if (strcmp(s, "noaddrs") != 0) {
 					    ts = (char *)malloc(ht->h_length);
 					    assert(ts != NULL);
@@ -650,9 +650,9 @@ hostent_read_snapshot_func(struct hostent *ht, char *line)
 				}
 			break;
 			default:
-			break;				
+			break;
 		};
-		
+
 		if ((i != 3) && (i != 4))
 			++i;
 	}
@@ -667,19 +667,19 @@ fin:
 		ht->h_addr_list = sl2->sl_str;
 	}
 
-	if ((i != 4) || (rv != 0)) {		
+	if ((i != 4) || (rv != 0)) {
 		free_hostent(ht);
 		memset(ht, 0, sizeof(struct hostent));
 		return (-1);
 	}
-	
+
 	/* NOTE: is it a dirty hack or not? */
 	free(sl1);
-	free(sl2);	
+	free(sl2);
 	return (0);
 }
 
-static void 
+static void
 dump_hostent(struct hostent *result)
 {
 	if (result != NULL) {
@@ -697,34 +697,34 @@ hostent_test_correctness(struct hostent *ht, void *mdata)
 		printf("testing correctness with the following data:\n");
 		dump_hostent(ht);
 	}
-	
+
 	if (ht == NULL)
 		goto errfin;
-	
+
 	if (ht->h_name == NULL)
 		goto errfin;
 
 	if (!((ht->h_addrtype >= 0) && (ht->h_addrtype < AF_MAX)))
 		goto errfin;
-	
-	if ((ht->h_length != sizeof(struct in_addr)) && 
+
+	if ((ht->h_length != sizeof(struct in_addr)) &&
 		(ht->h_length != sizeof(struct in6_addr)))
 		goto errfin;
-	
+
 	if (ht->h_aliases == NULL)
 		goto errfin;
-	
+
 	if (ht->h_addr_list == NULL)
 		goto errfin;
-		
+
 	if (debug)
 		printf("correct\n");
-	
-	return (0);	
+
+	return (0);
 errfin:
 	if (debug)
 		printf("incorrect\n");
-	
+
 	return (-1);
 }
 
@@ -733,23 +733,23 @@ hostent_test_gethostbyaddr(struct hostent *he, void *mdata)
 {
 	struct hostent *result;
 	struct hostent_test_data *addr_test_data;
-	int rv;	
-	
+	int rv;
+
 	addr_test_data = (struct hostent_test_data *)mdata;
-	
+
 	/* We should omit unresolved hostents */
 	if (he->h_addr_list != NULL) {
 		char **cp;
 		for (cp = he->h_addr_list; *cp; ++cp) {
 			if (debug)
 			    printf("doing reverse lookup for %s\n", he->h_name);
-			
+
 			result = __gethostbyaddr(*cp, he->h_length,
 			    he->h_addrtype);
 			if (result == NULL) {
 				if (debug)
 				    printf("warning: reverse lookup failed\n");
-				
+
 				continue;
 			}
 			rv = hostent_test_correctness(result, NULL);
@@ -757,14 +757,14 @@ hostent_test_gethostbyaddr(struct hostent *he, void *mdata)
 			    __freehostent(result);
 			    return (rv);
 			}
-			
+
 			if (addr_test_data != NULL)
 			    TEST_DATA_APPEND(hostent, addr_test_data, result);
-			
+
 			__freehostent(result);
 		}
 	}
-	
+
 	return (0);
 }
 
@@ -772,16 +772,16 @@ static int
 hostent_test_getaddrinfo_eq(struct hostent *he, void *mdata)
 {
 	struct addrinfo *ai, hints;
-	int rv;	
-	
+	int rv;
+
 	ai = NULL;
 	memset(&hints, 0, sizeof(struct addrinfo));
 	hints.ai_family = af_type;
 	hints.ai_flags = AI_CANONNAME;
-	
+
 	if (debug)
 		printf("using getaddrinfo() to resolve %s\n", he->h_name);
-	
+
 	/* struct hostent *he was not resolved */
 	if (he->h_addr_list == NULL) {
 		/* We can be sure that he->h_name is not NULL */
@@ -798,20 +798,20 @@ hostent_test_getaddrinfo_eq(struct hostent *he, void *mdata)
 			    printf("not ok - should have beed resolved\n");
 			return (-1);
 		}
-		
+
 		rv = is_hostent_equal(he, ai);
 		if (rv != 0) {
 			if (debug)
 			    printf("not ok - addrinfo and hostent are not equal\n");
 			return (-1);
 		}
-		
+
 	}
-	
+
 	return (0);
 }
 
-static int 
+static int
 hostent_test_getnameinfo_eq(struct hostent *he, void *mdata)
 {
 	char buffer[NI_MAXHOST];
@@ -820,13 +820,13 @@ hostent_test_getnameinfo_eq(struct hostent *he, void *mdata)
 	struct sockaddr *saddr;
 	struct hostent *result;
 	int rv;
-	
+
 	if (he->h_addr_list != NULL) {
 		char **cp;
 		for (cp = he->h_addr_list; *cp; ++cp) {
 			if (debug)
 			    printf("doing reverse lookup for %s\n", he->h_name);
-			
+
 			result = __gethostbyaddr(*cp, he->h_length,
 			    he->h_addrtype);
 			if (result != NULL) {
@@ -837,16 +837,16 @@ hostent_test_getnameinfo_eq(struct hostent *he, void *mdata)
 				}
 			} else {
 				if (debug)
-				    printf("reverse lookup failed\n");				
+				    printf("reverse lookup failed\n");
 			}
-			
+
 			switch (he->h_addrtype) {
 			case AF_INET:
 				memset(&sin, 0, sizeof(struct sockaddr_in));
 				sin.sin_len = sizeof(struct sockaddr_in);
 				sin.sin_family = AF_INET;
 				memcpy(&sin.sin_addr, *cp, he->h_length);
-				
+
 				saddr = (struct sockaddr *)&sin;
 				break;
 			case AF_INET6:
@@ -854,7 +854,7 @@ hostent_test_getnameinfo_eq(struct hostent *he, void *mdata)
 				sin6.sin6_len = sizeof(struct sockaddr_in6);
 				sin6.sin6_family = AF_INET6;
 				memcpy(&sin6.sin6_addr, *cp, he->h_length);
-				
+
 				saddr = (struct sockaddr *)&sin6;
 				break;
 			default:
@@ -863,38 +863,38 @@ hostent_test_getnameinfo_eq(struct hostent *he, void *mdata)
 						he->h_addrtype);
 				continue;
 			}
-			
+
 			assert(saddr != NULL);
-			rv = getnameinfo(saddr, saddr->sa_len, buffer, 
+			rv = getnameinfo(saddr, saddr->sa_len, buffer,
 				sizeof(buffer), NULL, 0, NI_NAMEREQD);
-			
+
 			if ((rv != 0) && (result != NULL)) {
 				if (debug)
 					printf("not ok - getnameinfo() didn't make the reverse lookup, when it should have (%s)\n",
 						gai_strerror(rv));
 				return (rv);
 			}
-			
+
 			if ((rv == 0) && (result == NULL)) {
 				if (debug)
-					printf("not ok - getnameinfo() made the reverse lookup, when it shouldn't have\n");					
+					printf("not ok - getnameinfo() made the reverse lookup, when it shouldn't have\n");
 				return (rv);
 			}
-			
+
 			if ((rv != 0) && (result == NULL)) {
 				if (debug)
 					printf("ok - both getnameinfo() and ***byaddr() failed\n");
-				
+
 				continue;
 			}
-			
+
 			if (debug)
 				printf("comparing %s with %s\n", result->h_name,
-					buffer);			
-			
+					buffer);
+
 			rv = strcmp(result->h_name, buffer);
 			__freehostent(result);
-			
+
 			if (rv != 0) {
 				if (debug)
 					printf("not ok - getnameinfo() and ***byaddr() results are not equal\n");
@@ -903,10 +903,10 @@ hostent_test_getnameinfo_eq(struct hostent *he, void *mdata)
 				if (debug)
 					printf("ok - getnameinfo() and ***byaddr() results are equal\n");
 			}
-		}		
+		}
 	}
-	
-	return (0);	
+
+	return (0);
 }
 
 static void
@@ -923,13 +923,13 @@ main(int argc, char **argv)
 {
 	struct hostent_test_data td, td_addr, td_snap;
 	char *snapshot_file, *hostlist_file;
-	res_state statp;	
+	res_state statp;
 	int rv;
 	int c;
-	
+
 	if (argc < 2)
 		usage();
-		
+
 	snapshot_file = NULL;
 	hostlist_file = NULL;
 	while ((c = getopt(argc, argv, "nad2iod46mAcMs:f:")) != -1)
@@ -986,37 +986,37 @@ main(int argc, char **argv)
 
 	if (use_ipnode_functions == 0) {
 		statp = __res_state();
-		if ((statp == NULL) || ((statp->options & RES_INIT) == 0 && 
+		if ((statp == NULL) || ((statp->options & RES_INIT) == 0 &&
 			res_ninit(statp) == -1)) {
 			if (debug)
 			    printf("error: can't init res_state\n");
-			
+
 			free(snapshot_file);
 			free(hostlist_file);
 			return (-1);
 		}
-	
-		if (use_ipv6_mapping == 0)	
+
+		if (use_ipv6_mapping == 0)
 			statp->options &= ~RES_USE_INET6;
 		else
 			statp->options |= RES_USE_INET6;
 	}
-	
+
 	TEST_DATA_INIT(hostent, &td, clone_hostent, free_hostent);
 	TEST_DATA_INIT(hostent, &td_addr, clone_hostent, free_hostent);
 	TEST_DATA_INIT(hostent, &td_snap, clone_hostent, free_hostent);
-			
+
 	if (hostlist_file == NULL)
 		usage();
-	
+
 	if (access(hostlist_file, R_OK) != 0) {
 		if (debug)
 			printf("can't access the hostlist file %s\n",
 				hostlist_file);
-		
+
 		usage();
 	}
-	
+
 	if (debug)
 		printf("building host lists from %s\n", hostlist_file);
 
@@ -1024,9 +1024,9 @@ main(int argc, char **argv)
 		hostent_read_hostlist_func);
 	if (rv != 0)
 		goto fin;
-	
+
 	if (snapshot_file != NULL) {
-		if (access(snapshot_file, W_OK | R_OK) != 0) {		
+		if (access(snapshot_file, W_OK | R_OK) != 0) {
 			if (errno == ENOENT) {
 				if (method != TEST_GETHOSTBYADDR)
 					method = TEST_BUILD_SNAPSHOT;
@@ -1036,7 +1036,7 @@ main(int argc, char **argv)
 				if (debug)
 				    printf("can't access the snapshot file %s\n",
 				    snapshot_file);
-			
+
 				rv = -1;
 				goto fin;
 			}
@@ -1050,7 +1050,7 @@ main(int argc, char **argv)
 			}
 		}
 	}
-		
+
 	switch (method) {
 	case TEST_GETHOSTBYNAME2:
 		if (snapshot_file != NULL)
@@ -1062,7 +1062,7 @@ main(int argc, char **argv)
 			hostent_test_gethostbyaddr, (void *)&td_addr);
 
 		if (snapshot_file != NULL)
-			rv = DO_2PASS_TEST(hostent, &td_addr, &td_snap, 
+			rv = DO_2PASS_TEST(hostent, &td_addr, &td_snap,
 				compare_hostent, NULL);
 		break;
 	case TEST_GETHOSTBYNAME2_GETADDRINFO:
@@ -1075,7 +1075,7 @@ main(int argc, char **argv)
 		break;
 	case TEST_BUILD_SNAPSHOT:
 		if (snapshot_file != NULL) {
-		    rv = TEST_SNAPSHOT_FILE_WRITE(hostent, snapshot_file, &td, 
+		    rv = TEST_SNAPSHOT_FILE_WRITE(hostent, snapshot_file, &td,
 			sdump_hostent);
 		}
 		break;
@@ -1083,8 +1083,8 @@ main(int argc, char **argv)
 		if (snapshot_file != NULL) {
 			rv = DO_1PASS_TEST(hostent, &td,
 				hostent_test_gethostbyaddr, (void *)&td_addr);
-			
-		    rv = TEST_SNAPSHOT_FILE_WRITE(hostent, snapshot_file, 
+
+		    rv = TEST_SNAPSHOT_FILE_WRITE(hostent, snapshot_file,
 			&td_addr, sdump_hostent);
 		}
 		break;
diff --git a/tools/regression/lib/libc/nss/test-getproto.c b/tools/regression/lib/libc/nss/test-getproto.c
index 89ad087..a3ba271 100644
--- a/tools/regression/lib/libc/nss/test-getproto.c
+++ b/tools/regression/lib/libc/nss/test-getproto.c
@@ -63,14 +63,14 @@ static void free_protoent(struct protoent *);
 static void sdump_protoent(struct protoent *, char *, size_t);
 static int protoent_read_snapshot_func(struct protoent *, char *);
 
-static int protoent_check_ambiguity(struct protoent_test_data *, 
+static int protoent_check_ambiguity(struct protoent_test_data *,
 	struct protoent *);
 static int protoent_fill_test_data(struct protoent_test_data *);
 static int protoent_test_correctness(struct protoent *, void *);
 static int protoent_test_getprotobyname(struct protoent *, void *);
 static int protoent_test_getprotobynumber(struct protoent *, void *);
 static int protoent_test_getprotoent(struct protoent *, void *);
-	
+
 static void usage(void)  __attribute__((__noreturn__));
 
 IMPLEMENT_TEST_DATA(protoent)
@@ -83,28 +83,28 @@ clone_protoent(struct protoent *dest, struct protoent const *src)
 {
 	assert(dest != NULL);
 	assert(src != NULL);
-	
+
 	char **cp;
 	int aliases_num;
-		
+
 	memset(dest, 0, sizeof(struct protoent));
-	
+
 	if (src->p_name != NULL) {
 		dest->p_name = strdup(src->p_name);
 		assert(dest->p_name != NULL);
 	}
-	
+
 	dest->p_proto = src->p_proto;
-	
+
 	if (src->p_aliases != NULL) {
 		aliases_num = 0;
 		for (cp = src->p_aliases; *cp; ++cp)
 			++aliases_num;
-	
+
 		dest->p_aliases = (char **)malloc((aliases_num+1) * (sizeof(char *)));
 		assert(dest->p_aliases != NULL);
 		memset(dest->p_aliases, 0, (aliases_num+1) * (sizeof(char *)));
-	
+
 		for (cp = src->p_aliases; *cp; ++cp) {
 			dest->p_aliases[cp - src->p_aliases] = strdup(*cp);
 			assert(dest->p_aliases[cp - src->p_aliases] != NULL);
@@ -112,50 +112,50 @@ clone_protoent(struct protoent *dest, struct protoent const *src)
 	}
 }
 
-static void 
+static void
 free_protoent(struct protoent *pe)
 {
 	char **cp;
-	
+
 	assert(pe != NULL);
-	
+
 	free(pe->p_name);
-	
+
 	for (cp = pe->p_aliases; *cp; ++cp)
 		free(*cp);
 	free(pe->p_aliases);
 }
 
-static  int 
+static  int
 compare_protoent(struct protoent *pe1, struct protoent *pe2, void *mdata)
 {
 	char **c1, **c2;
-        
+
 	if (pe1 == pe2)
 		return 0;
-        
+
 	if ((pe1 == NULL) || (pe2 == NULL))
 		goto errfin;
-        
+
 	if ((strcmp(pe1->p_name, pe2->p_name) != 0) ||
 		(pe1->p_proto != pe2->p_proto))
 			goto errfin;
-        
+
 	c1 = pe1->p_aliases;
 	c2 = pe2->p_aliases;
-	
+
 	if ((pe1->p_aliases == NULL) || (pe2->p_aliases == NULL))
 		goto errfin;
-	
+
 	for (;*c1 && *c2; ++c1, ++c2)
 		if (strcmp(*c1, *c2) != 0)
 			goto errfin;
-                
+
 	if ((*c1 != '\0') || (*c2 != '\0'))
 		goto errfin;
-        
+
 	return 0;
-	
+
 errfin:
 	if ((debug) && (mdata == NULL)) {
 		printf("following structures are not equal:\n");
@@ -171,14 +171,14 @@ sdump_protoent(struct protoent *pe, char *buffer, size_t buflen)
 {
 	char **cp;
 	int written;
-	
+
 	written = snprintf(buffer, buflen, "%s %d",
-		pe->p_name, pe->p_proto);	
+		pe->p_name, pe->p_proto);
 	buffer += written;
 	if (written > buflen)
 		return;
 	buflen -= written;
-			
+
 	if (pe->p_aliases != NULL) {
 		if (*(pe->p_aliases) != '\0') {
 			for (cp = pe->p_aliases; *cp; ++cp) {
@@ -187,9 +187,9 @@ sdump_protoent(struct protoent *pe, char *buffer, size_t buflen)
 				if (written > buflen)
 					return;
 				buflen -= written;
-				
+
 				if (buflen == 0)
-					return;				
+					return;
 			}
 		} else
 			snprintf(buffer, buflen, " noaliases");
@@ -206,7 +206,7 @@ protoent_read_snapshot_func(struct protoent *pe, char *line)
 
 	if (debug)
 		printf("1 line read from snapshot:\n%s\n", line);
-	
+
 	i = 0;
 	sl = NULL;
 	ps = line;
@@ -230,10 +230,10 @@ protoent_read_snapshot_func(struct protoent *pe, char *line)
 				if (sl == NULL) {
 					if (strcmp(s, "(null)") == 0)
 						return (0);
-										
+
 					sl = sl_init();
 					assert(sl != NULL);
-					
+
 					if (strcmp(s, "noaliases") != 0) {
 						ts = strdup(s);
 						assert(ts != NULL);
@@ -244,7 +244,7 @@ protoent_read_snapshot_func(struct protoent *pe, char *line)
 					assert(ts != NULL);
 					sl_add(sl, ts);
 				}
-			break;			
+			break;
 		};
 		++i;
 	}
@@ -254,16 +254,16 @@ protoent_read_snapshot_func(struct protoent *pe, char *line)
 		memset(pe, 0, sizeof(struct protoent));
 		return (-1);
 	}
-	
+
 	sl_add(sl, NULL);
 	pe->p_aliases = sl->sl_str;
 
 	/* NOTE: is it a dirty hack or not? */
-	free(sl);	
+	free(sl);
 	return (0);
 }
 
-static void 
+static void
 dump_protoent(struct protoent *result)
 {
 	if (result != NULL) {
@@ -278,7 +278,7 @@ static int
 protoent_fill_test_data(struct protoent_test_data *td)
 {
 	struct protoent *pe;
-		
+
 	setprotoent(1);
 	while ((pe = getprotoent()) != NULL) {
 		if (protoent_test_correctness(pe, NULL) == 0)
@@ -287,7 +287,7 @@ protoent_fill_test_data(struct protoent_test_data *td)
 			return (-1);
 	}
 	endprotoent();
-	
+
 	return (0);
 }
 
@@ -298,39 +298,39 @@ protoent_test_correctness(struct protoent *pe, void *mdata)
 		printf("testing correctness with the following data:\n");
 		dump_protoent(pe);
 	}
-	
+
 	if (pe == NULL)
 		goto errfin;
-	
+
 	if (pe->p_name == NULL)
 		goto errfin;
-	
+
 	if (pe->p_proto < 0)
 		goto errfin;
-	
+
 	if (pe->p_aliases == NULL)
 		goto errfin;
-	
+
 	if (debug)
 		printf("correct\n");
-	
-	return (0);	
+
+	return (0);
 errfin:
 	if (debug)
 		printf("incorrect\n");
-	
+
 	return (-1);
 }
 
 /* protoent_check_ambiguity() is needed when one port+proto is associated with
  * more than one peice (these cases are usually marked as PROBLEM in
- * /etc/peices. This functions is needed also when one peice+proto is 
+ * /etc/peices. This functions is needed also when one peice+proto is
  * associated with several ports. We have to check all the protoent structures
  * to make sure that pe really exists and correct */
 static int
 protoent_check_ambiguity(struct protoent_test_data *td, struct protoent *pe)
 {
-	
+
 	return (TEST_DATA_FIND(protoent, td, pe, compare_protoent,
 		NULL) != NULL ? 0 : -1);
 }
@@ -340,7 +340,7 @@ protoent_test_getprotobyname(struct protoent *pe_model, void *mdata)
 {
 	char **alias;
 	struct protoent *pe;
-		
+
 	if (debug) {
 		printf("testing getprotobyname() with the following data:\n");
 		dump_protoent(pe_model);
@@ -349,32 +349,32 @@ protoent_test_getprotobyname(struct protoent *pe_model, void *mdata)
 	pe = getprotobyname(pe_model->p_name);
 	if (protoent_test_correctness(pe, NULL) != 0)
 		goto errfin;
-	
+
 	if ((compare_protoent(pe, pe_model, NULL) != 0) &&
-	    (protoent_check_ambiguity((struct protoent_test_data *)mdata, pe) 
+	    (protoent_check_ambiguity((struct protoent_test_data *)mdata, pe)
 	    !=0))
 	    goto errfin;
-	
+
 	for (alias = pe_model->p_aliases; *alias; ++alias) {
 		pe = getprotobyname(*alias);
-		
+
 		if (protoent_test_correctness(pe, NULL) != 0)
 			goto errfin;
-		
+
 		if ((compare_protoent(pe, pe_model, NULL) != 0) &&
 		    (protoent_check_ambiguity(
 		    (struct protoent_test_data *)mdata, pe) != 0))
 		    goto errfin;
 	}
-	
+
 	if (debug)
 		printf("ok\n");
 	return (0);
-	
+
 errfin:
 	if (debug)
 		printf("not ok\n");
-	
+
 	return (-1);
 }
 
@@ -382,14 +382,14 @@ static int
 protoent_test_getprotobynumber(struct protoent *pe_model, void *mdata)
 {
 	struct protoent *pe;
-		
+
 	if (debug) {
 		printf("testing getprotobyport() with the following data...\n");
 		dump_protoent(pe_model);
-	}	
-	
+	}
+
 	pe = getprotobynumber(pe_model->p_proto);
-	if ((protoent_test_correctness(pe, NULL) != 0) || 
+	if ((protoent_test_correctness(pe, NULL) != 0) ||
 	    ((compare_protoent(pe, pe_model, NULL) != 0) &&
 	    (protoent_check_ambiguity((struct protoent_test_data *)mdata, pe)
 	    != 0))) {
@@ -403,7 +403,7 @@ protoent_test_getprotobynumber(struct protoent *pe_model, void *mdata)
 	}
 }
 
-static int 
+static int
 protoent_test_getprotoent(struct protoent *pe, void *mdata)
 {
 	/* Only correctness can be checked when doing 1-pass test for
@@ -427,10 +427,10 @@ main(int argc, char **argv)
 	char *snapshot_file;
 	int rv;
 	int c;
-	
+
 	if (argc < 2)
 		usage();
-		
+
 	snapshot_file = NULL;
 	while ((c = getopt(argc, argv, "nve2ds:")) != -1)
 		switch (c) {
@@ -455,18 +455,18 @@ main(int argc, char **argv)
 		default:
 			usage();
 		}
-	
+
 	TEST_DATA_INIT(protoent, &td, clone_protoent, free_protoent);
 	TEST_DATA_INIT(protoent, &td_snap, clone_protoent, free_protoent);
 	if (snapshot_file != NULL) {
-		if (access(snapshot_file, W_OK | R_OK) != 0) {		
+		if (access(snapshot_file, W_OK | R_OK) != 0) {
 			if (errno == ENOENT)
 				method = TEST_BUILD_SNAPSHOT;
 			else {
 				if (debug)
 					printf("can't access the file %s\n",
 				snapshot_file);
-			
+
 				rv = -1;
 				goto fin;
 			}
@@ -475,12 +475,12 @@ main(int argc, char **argv)
 				rv = 0;
 				goto fin;
 			}
-			
+
 			TEST_SNAPSHOT_FILE_READ(protoent, snapshot_file,
 				&td_snap, protoent_read_snapshot_func);
 		}
 	}
-		
+
 	rv = protoent_fill_test_data(&td);
 	if (rv == -1)
 		return (-1);
@@ -490,7 +490,7 @@ main(int argc, char **argv)
 			rv = DO_1PASS_TEST(protoent, &td,
 				protoent_test_getprotobyname, (void *)&td);
 		else
-			rv = DO_1PASS_TEST(protoent, &td_snap, 
+			rv = DO_1PASS_TEST(protoent, &td_snap,
 				protoent_test_getprotobyname, (void *)&td_snap);
 		break;
 	case TEST_GETPROTOBYNUMBER:
@@ -498,12 +498,12 @@ main(int argc, char **argv)
 			rv = DO_1PASS_TEST(protoent, &td,
 				protoent_test_getprotobynumber, (void *)&td);
 		else
-			rv = DO_1PASS_TEST(protoent, &td_snap, 
+			rv = DO_1PASS_TEST(protoent, &td_snap,
 				protoent_test_getprotobynumber, (void *)&td_snap);
 		break;
 	case TEST_GETPROTOENT:
 		if (snapshot_file == NULL)
-			rv = DO_1PASS_TEST(protoent, &td, 
+			rv = DO_1PASS_TEST(protoent, &td,
 				protoent_test_getprotoent, (void *)&td);
 		else
 			rv = DO_2PASS_TEST(protoent, &td, &td_snap,
@@ -520,7 +520,7 @@ main(int argc, char **argv)
 		break;
 	case TEST_BUILD_SNAPSHOT:
 		if (snapshot_file != NULL)
-		    rv = TEST_SNAPSHOT_FILE_WRITE(protoent, snapshot_file, &td, 
+		    rv = TEST_SNAPSHOT_FILE_WRITE(protoent, snapshot_file, &td,
 			sdump_protoent);
 		break;
 	default:
@@ -531,6 +531,6 @@ main(int argc, char **argv)
 fin:
 	TEST_DATA_DESTROY(protoent, &td_snap);
 	TEST_DATA_DESTROY(protoent, &td);
-	free(snapshot_file);	
+	free(snapshot_file);
 	return (rv);
 }
diff --git a/tools/regression/lib/libc/nss/test-getpw.c b/tools/regression/lib/libc/nss/test-getpw.c
index bb88f6a..a0b348d 100644
--- a/tools/regression/lib/libc/nss/test-getpw.c
+++ b/tools/regression/lib/libc/nss/test-getpw.c
@@ -68,7 +68,7 @@ static int passwd_test_correctness(struct passwd *, void *);
 static int passwd_test_getpwnam(struct passwd *, void *);
 static int passwd_test_getpwuid(struct passwd *, void *);
 static int passwd_test_getpwent(struct passwd *, void *);
-	
+
 static void usage(void)  __attribute__((__noreturn__));
 
 IMPLEMENT_TEST_DATA(passwd)
@@ -76,12 +76,12 @@ IMPLEMENT_TEST_FILE_SNAPSHOT(passwd)
 IMPLEMENT_1PASS_TEST(passwd)
 IMPLEMENT_2PASS_TEST(passwd)
 
-static void 
+static void
 clone_passwd(struct passwd *dest, struct passwd const *src)
 {
 	assert(dest != NULL);
 	assert(src != NULL);
-	
+
 	memcpy(dest, src, sizeof(struct passwd));
 	if (src->pw_name != NULL)
 		dest->pw_name = strdup(src->pw_name);
@@ -97,15 +97,15 @@ clone_passwd(struct passwd *dest, struct passwd const *src)
 		dest->pw_shell = strdup(dest->pw_shell);
 }
 
-static int 
+static int
 compare_passwd(struct passwd *pwd1, struct passwd *pwd2, void *mdata)
 {
 	assert(pwd1 != NULL);
 	assert(pwd2 != NULL);
-	
+
 	if (pwd1 == pwd2)
 		return (0);
-	
+
 	if ((pwd1->pw_uid != pwd2->pw_uid) ||
 		(pwd1->pw_gid != pwd2->pw_gid) ||
 		(pwd1->pw_change != pwd2->pw_change) ||
@@ -116,14 +116,14 @@ compare_passwd(struct passwd *pwd1, struct passwd *pwd2, void *mdata)
 		(strcmp(pwd1->pw_class, pwd2->pw_class) != 0) ||
 		(strcmp(pwd1->pw_gecos, pwd2->pw_gecos) != 0) ||
 		(strcmp(pwd1->pw_dir, pwd2->pw_dir) != 0) ||
-		(strcmp(pwd1->pw_shell, pwd2->pw_shell) != 0)	
+		(strcmp(pwd1->pw_shell, pwd2->pw_shell) != 0)
 		)
 		return (-1);
 	else
 		return (0);
 }
 
-static void 
+static void
 free_passwd(struct passwd *pwd)
 {
 	free(pwd->pw_name);
@@ -134,7 +134,7 @@ free_passwd(struct passwd *pwd)
 	free(pwd->pw_shell);
 }
 
-static void 
+static void
 sdump_passwd(struct passwd *pwd, char *buffer, size_t buflen)
 {
 	snprintf(buffer, buflen, "%s:%s:%d:%d:%d:%s:%s:%s:%s:%d:%d",
@@ -154,7 +154,7 @@ dump_passwd(struct passwd *pwd)
 		printf("(null)\n");
 }
 
-static int 
+static int
 passwd_read_snapshot_func(struct passwd *pwd, char *line)
 {
 	char *s, *ps, *ts;
@@ -162,7 +162,7 @@ passwd_read_snapshot_func(struct passwd *pwd, char *line)
 
 	if (debug)
 		printf("1 line read from snapshot:\n%s\n", line);
-	
+
 	i = 0;
 	ps = line;
 	memset(pwd, 0, sizeof(struct passwd));
@@ -174,7 +174,7 @@ passwd_read_snapshot_func(struct passwd *pwd, char *line)
 			break;
 			case 1:
 				pwd->pw_passwd = strdup(s);
-				assert(pwd->pw_passwd != NULL);				
+				assert(pwd->pw_passwd != NULL);
 			break;
 			case 2:
 				pwd->pw_uid = (uid_t)strtol(s, &ts, 10);
@@ -218,7 +218,7 @@ passwd_read_snapshot_func(struct passwd *pwd, char *line)
 					goto fin;
 			break;
 			default:
-			break;			
+			break;
 		};
 		++i;
 	}
@@ -229,7 +229,7 @@ fin:
 		memset(pwd, 0, sizeof(struct passwd));
 		return (-1);
 	}
-	
+
 	return (0);
 }
 
@@ -237,7 +237,7 @@ static int
 passwd_fill_test_data(struct passwd_test_data *td)
 {
 	struct passwd *pwd;
-		
+
 	setpassent(1);
 	while ((pwd = getpwent()) != NULL) {
 		if (passwd_test_correctness(pwd, NULL) == 0)
@@ -246,7 +246,7 @@ passwd_fill_test_data(struct passwd_test_data *td)
 			return (-1);
 	}
 	endpwent();
-	
+
 	return (0);
 }
 
@@ -257,9 +257,9 @@ passwd_test_correctness(struct passwd *pwd, void *mdata)
 		printf("testing correctness with the following data:\n");
 		dump_passwd(pwd);
 	}
-	
+
 	if (pwd == NULL)
-		return (-1);	
+		return (-1);
 
 	if (pwd->pw_name == NULL)
 		goto errfin;
@@ -278,25 +278,25 @@ passwd_test_correctness(struct passwd *pwd, void *mdata)
 
 	if (pwd->pw_shell == NULL)
 		goto errfin;
-	
+
 	if (debug)
 		printf("correct\n");
-	
-	return (0);	
+
+	return (0);
 errfin:
 	if (debug)
 		printf("incorrect\n");
-	
+
 	return (-1);
 }
 
 /* passwd_check_ambiguity() is needed here because when doing the getpwent()
- * calls sequence, records from different nsswitch sources can be different, 
+ * calls sequence, records from different nsswitch sources can be different,
  * though having the same pw_name/pw_uid */
 static int
 passwd_check_ambiguity(struct passwd_test_data *td, struct passwd *pwd)
 {
-	
+
 	return (TEST_DATA_FIND(passwd, td, pwd, compare_passwd,
 		NULL) != NULL ? 0 : -1);
 }
@@ -305,7 +305,7 @@ static int
 passwd_test_getpwnam(struct passwd *pwd_model, void *mdata)
 {
 	struct passwd *pwd;
-		
+
 	if (debug) {
 		printf("testing getpwnam() with the following data:\n");
 		dump_passwd(pwd_model);
@@ -314,20 +314,20 @@ passwd_test_getpwnam(struct passwd *pwd_model, void *mdata)
 	pwd = getpwnam(pwd_model->pw_name);
 	if (passwd_test_correctness(pwd, NULL) != 0)
 		goto errfin;
-	
+
 	if ((compare_passwd(pwd, pwd_model, NULL) != 0) &&
-	    (passwd_check_ambiguity((struct passwd_test_data *)mdata, pwd) 
+	    (passwd_check_ambiguity((struct passwd_test_data *)mdata, pwd)
 	    !=0))
 	    goto errfin;
-		
+
 	if (debug)
 		printf("ok\n");
 	return (0);
-	
+
 errfin:
 	if (debug)
 		printf("not ok\n");
-	
+
 	return (-1);
 }
 
@@ -335,14 +335,14 @@ static int
 passwd_test_getpwuid(struct passwd *pwd_model, void *mdata)
 {
 	struct passwd *pwd;
-		
+
 	if (debug) {
 		printf("testing getpwuid() with the following data...\n");
 		dump_passwd(pwd_model);
-	}	
-	
+	}
+
 	pwd = getpwuid(pwd_model->pw_uid);
-	if ((passwd_test_correctness(pwd, NULL) != 0) || 
+	if ((passwd_test_correctness(pwd, NULL) != 0) ||
 	    ((compare_passwd(pwd, pwd_model, NULL) != 0) &&
 	    (passwd_check_ambiguity((struct passwd_test_data *)mdata, pwd)
 	    != 0))) {
@@ -356,7 +356,7 @@ passwd_test_getpwuid(struct passwd *pwd_model, void *mdata)
 	}
 }
 
-static int 
+static int
 passwd_test_getpwent(struct passwd *pwd, void *mdata)
 {
 	/* Only correctness can be checked when doing 1-pass test for
@@ -380,10 +380,10 @@ main(int argc, char **argv)
 	char *snapshot_file;
 	int rv;
 	int c;
-	
+
 	if (argc < 2)
 		usage();
-		
+
 	snapshot_file = NULL;
 	while ((c = getopt(argc, argv, "nue2ds:")) != -1)
 		switch (c) {
@@ -408,18 +408,18 @@ main(int argc, char **argv)
 		default:
 			usage();
 		}
-	
+
 	TEST_DATA_INIT(passwd, &td, clone_passwd, free_passwd);
 	TEST_DATA_INIT(passwd, &td_snap, clone_passwd, free_passwd);
 	if (snapshot_file != NULL) {
-		if (access(snapshot_file, W_OK | R_OK) != 0) {		
+		if (access(snapshot_file, W_OK | R_OK) != 0) {
 			if (errno == ENOENT)
 				method = TEST_BUILD_SNAPSHOT;
 			else {
 				if (debug)
 					printf("can't access the file %s\n",
 				snapshot_file);
-			
+
 				rv = -1;
 				goto fin;
 			}
@@ -428,23 +428,23 @@ main(int argc, char **argv)
 				rv = 0;
 				goto fin;
 			}
-			
+
 			TEST_SNAPSHOT_FILE_READ(passwd, snapshot_file,
 				&td_snap, passwd_read_snapshot_func);
 		}
 	}
-		
+
 	rv = passwd_fill_test_data(&td);
 	if (rv == -1)
 		return (-1);
-	
+
 	switch (method) {
 	case TEST_GETPWNAM:
 		if (snapshot_file == NULL)
 			rv = DO_1PASS_TEST(passwd, &td,
 				passwd_test_getpwnam, (void *)&td);
 		else
-			rv = DO_1PASS_TEST(passwd, &td_snap, 
+			rv = DO_1PASS_TEST(passwd, &td_snap,
 				passwd_test_getpwnam, (void *)&td_snap);
 		break;
 	case TEST_GETPWUID:
@@ -452,7 +452,7 @@ main(int argc, char **argv)
 			rv = DO_1PASS_TEST(passwd, &td,
 				passwd_test_getpwuid, (void *)&td);
 		else
-			rv = DO_1PASS_TEST(passwd, &td_snap, 
+			rv = DO_1PASS_TEST(passwd, &td_snap,
 				passwd_test_getpwuid, (void *)&td_snap);
 		break;
 	case TEST_GETPWENT:
@@ -465,7 +465,7 @@ main(int argc, char **argv)
 		break;
 	case TEST_GETPWENT_2PASS:
 			TEST_DATA_INIT(passwd, &td_2pass, clone_passwd, free_passwd);
-			rv = passwd_fill_test_data(&td_2pass);			
+			rv = passwd_fill_test_data(&td_2pass);
 			if (rv != -1)
 				rv = DO_2PASS_TEST(passwd, &td, &td_2pass,
 					compare_passwd, NULL);
@@ -473,7 +473,7 @@ main(int argc, char **argv)
 		break;
 	case TEST_BUILD_SNAPSHOT:
 		if (snapshot_file != NULL)
-		    rv = TEST_SNAPSHOT_FILE_WRITE(passwd, snapshot_file, &td, 
+		    rv = TEST_SNAPSHOT_FILE_WRITE(passwd, snapshot_file, &td,
 			sdump_passwd);
 		break;
 	default:
@@ -484,6 +484,6 @@ main(int argc, char **argv)
 fin:
 	TEST_DATA_DESTROY(passwd, &td_snap);
 	TEST_DATA_DESTROY(passwd, &td);
-	free(snapshot_file);	
+	free(snapshot_file);
 	return (rv);
 }
diff --git a/tools/regression/lib/libc/nss/test-getrpc.c b/tools/regression/lib/libc/nss/test-getrpc.c
index 4041e88..707186e 100644
--- a/tools/regression/lib/libc/nss/test-getrpc.c
+++ b/tools/regression/lib/libc/nss/test-getrpc.c
@@ -63,14 +63,14 @@ static void free_rpcent(struct rpcent *);
 static void sdump_rpcent(struct rpcent *, char *, size_t);
 static int rpcent_read_snapshot_func(struct rpcent *, char *);
 
-static int rpcent_check_ambiguity(struct rpcent_test_data *, 
+static int rpcent_check_ambiguity(struct rpcent_test_data *,
 	struct rpcent *);
 static int rpcent_fill_test_data(struct rpcent_test_data *);
 static int rpcent_test_correctness(struct rpcent *, void *);
 static int rpcent_test_getrpcbyname(struct rpcent *, void *);
 static int rpcent_test_getrpcbynumber(struct rpcent *, void *);
 static int rpcent_test_getrpcent(struct rpcent *, void *);
-	
+
 static void usage(void)  __attribute__((__noreturn__));
 
 IMPLEMENT_TEST_DATA(rpcent)
@@ -83,28 +83,28 @@ clone_rpcent(struct rpcent *dest, struct rpcent const *src)
 {
 	assert(dest != NULL);
 	assert(src != NULL);
-	
+
 	char **cp;
 	int aliases_num;
-		
+
 	memset(dest, 0, sizeof(struct rpcent));
-	
+
 	if (src->r_name != NULL) {
 		dest->r_name = strdup(src->r_name);
 		assert(dest->r_name != NULL);
 	}
-	
+
 	dest->r_number = src->r_number;
-	
+
 	if (src->r_aliases != NULL) {
 		aliases_num = 0;
 		for (cp = src->r_aliases; *cp; ++cp)
 			++aliases_num;
-	
+
 		dest->r_aliases = (char **)malloc((aliases_num+1) * (sizeof(char *)));
 		assert(dest->r_aliases != NULL);
 		memset(dest->r_aliases, 0, (aliases_num+1) * (sizeof(char *)));
-	
+
 		for (cp = src->r_aliases; *cp; ++cp) {
 			dest->r_aliases[cp - src->r_aliases] = strdup(*cp);
 			assert(dest->r_aliases[cp - src->r_aliases] != NULL);
@@ -112,50 +112,50 @@ clone_rpcent(struct rpcent *dest, struct rpcent const *src)
 	}
 }
 
-static void 
+static void
 free_rpcent(struct rpcent *rpc)
 {
 	char **cp;
-	
+
 	assert(rpc != NULL);
-	
+
 	free(rpc->r_name);
-	
+
 	for (cp = rpc->r_aliases; *cp; ++cp)
 		free(*cp);
 	free(rpc->r_aliases);
 }
 
-static  int 
+static  int
 compare_rpcent(struct rpcent *rpc1, struct rpcent *rpc2, void *mdata)
 {
 	char **c1, **c2;
-        
+
 	if (rpc1 == rpc2)
 		return 0;
-        
+
 	if ((rpc1 == NULL) || (rpc2 == NULL))
 		goto errfin;
-        
+
 	if ((strcmp(rpc1->r_name, rpc2->r_name) != 0) ||
 		(rpc1->r_number != rpc2->r_number))
 			goto errfin;
-        
+
 	c1 = rpc1->r_aliases;
 	c2 = rpc2->r_aliases;
-	
+
 	if ((rpc1->r_aliases == NULL) || (rpc2->r_aliases == NULL))
 		goto errfin;
-	
+
 	for (;*c1 && *c2; ++c1, ++c2)
 		if (strcmp(*c1, *c2) != 0)
 			goto errfin;
-                
+
 	if ((*c1 != '\0') || (*c2 != '\0'))
 		goto errfin;
-        
+
 	return 0;
-	
+
 errfin:
 	if ((debug) && (mdata == NULL)) {
 		printf("following structures are not equal:\n");
@@ -171,14 +171,14 @@ sdump_rpcent(struct rpcent *rpc, char *buffer, size_t buflen)
 {
 	char **cp;
 	int written;
-	
+
 	written = snprintf(buffer, buflen, "%s %d",
-		rpc->r_name, rpc->r_number);	
+		rpc->r_name, rpc->r_number);
 	buffer += written;
 	if (written > buflen)
 		return;
 	buflen -= written;
-			
+
 	if (rpc->r_aliases != NULL) {
 		if (*(rpc->r_aliases) != '\0') {
 			for (cp = rpc->r_aliases; *cp; ++cp) {
@@ -187,9 +187,9 @@ sdump_rpcent(struct rpcent *rpc, char *buffer, size_t buflen)
 				if (written > buflen)
 					return;
 				buflen -= written;
-				
+
 				if (buflen == 0)
-					return;				
+					return;
 			}
 		} else
 			snprintf(buffer, buflen, " noaliases");
@@ -206,7 +206,7 @@ rpcent_read_snapshot_func(struct rpcent *rpc, char *line)
 
 	if (debug)
 		printf("1 line read from snapshot:\n%s\n", line);
-	
+
 	i = 0;
 	sl = NULL;
 	ps = line;
@@ -230,10 +230,10 @@ rpcent_read_snapshot_func(struct rpcent *rpc, char *line)
 				if (sl == NULL) {
 					if (strcmp(s, "(null)") == 0)
 						return (0);
-										
+
 					sl = sl_init();
 					assert(sl != NULL);
-					
+
 					if (strcmp(s, "noaliases") != 0) {
 						ts = strdup(s);
 						assert(ts != NULL);
@@ -244,7 +244,7 @@ rpcent_read_snapshot_func(struct rpcent *rpc, char *line)
 					assert(ts != NULL);
 					sl_add(sl, ts);
 				}
-			break;			
+			break;
 		};
 		++i;
 	}
@@ -254,16 +254,16 @@ rpcent_read_snapshot_func(struct rpcent *rpc, char *line)
 		memset(rpc, 0, sizeof(struct rpcent));
 		return (-1);
 	}
-	
+
 	sl_add(sl, NULL);
 	rpc->r_aliases = sl->sl_str;
 
 	/* NOTE: is it a dirty hack or not? */
-	free(sl);	
+	free(sl);
 	return (0);
 }
 
-static void 
+static void
 dump_rpcent(struct rpcent *result)
 {
 	if (result != NULL) {
@@ -278,7 +278,7 @@ static int
 rpcent_fill_test_data(struct rpcent_test_data *td)
 {
 	struct rpcent *rpc;
-		
+
 	setrpcent(1);
 	while ((rpc = getrpcent()) != NULL) {
 		if (rpcent_test_correctness(rpc, NULL) == 0)
@@ -287,7 +287,7 @@ rpcent_fill_test_data(struct rpcent_test_data *td)
 			return (-1);
 	}
 	endrpcent();
-	
+
 	return (0);
 }
 
@@ -298,39 +298,39 @@ rpcent_test_correctness(struct rpcent *rpc, void *mdata)
 		printf("testing correctness with the following data:\n");
 		dump_rpcent(rpc);
 	}
-	
+
 	if (rpc == NULL)
 		goto errfin;
-	
+
 	if (rpc->r_name == NULL)
 		goto errfin;
-	
+
 	if (rpc->r_number < 0)
 		goto errfin;
-	
+
 	if (rpc->r_aliases == NULL)
 		goto errfin;
-	
+
 	if (debug)
 		printf("correct\n");
-	
-	return (0);	
+
+	return (0);
 errfin:
 	if (debug)
 		printf("incorrect\n");
-	
+
 	return (-1);
 }
 
 /* rpcent_check_ambiguity() is needed when one port+rpc is associated with
  * more than one peice (these cases are usually marked as PROBLEM in
- * /etc/peices. This functions is needed also when one peice+rpc is 
+ * /etc/peices. This functions is needed also when one peice+rpc is
  * associated with several ports. We have to check all the rpcent structures
  * to make sure that rpc really exists and correct */
 static int
 rpcent_check_ambiguity(struct rpcent_test_data *td, struct rpcent *rpc)
 {
-	
+
 	return (TEST_DATA_FIND(rpcent, td, rpc, compare_rpcent,
 		NULL) != NULL ? 0 : -1);
 }
@@ -340,7 +340,7 @@ rpcent_test_getrpcbyname(struct rpcent *rpc_model, void *mdata)
 {
 	char **alias;
 	struct rpcent *rpc;
-		
+
 	if (debug) {
 		printf("testing getrpcbyname() with the following data:\n");
 		dump_rpcent(rpc_model);
@@ -349,32 +349,32 @@ rpcent_test_getrpcbyname(struct rpcent *rpc_model, void *mdata)
 	rpc = getrpcbyname(rpc_model->r_name);
 	if (rpcent_test_correctness(rpc, NULL) != 0)
 		goto errfin;
-	
+
 	if ((compare_rpcent(rpc, rpc_model, NULL) != 0) &&
-	    (rpcent_check_ambiguity((struct rpcent_test_data *)mdata, rpc) 
+	    (rpcent_check_ambiguity((struct rpcent_test_data *)mdata, rpc)
 	    !=0))
 	    goto errfin;
-	
+
 	for (alias = rpc_model->r_aliases; *alias; ++alias) {
 		rpc = getrpcbyname(*alias);
-		
+
 		if (rpcent_test_correctness(rpc, NULL) != 0)
 			goto errfin;
-		
+
 		if ((compare_rpcent(rpc, rpc_model, NULL) != 0) &&
 		    (rpcent_check_ambiguity(
 		    (struct rpcent_test_data *)mdata, rpc) != 0))
 		    goto errfin;
 	}
-	
+
 	if (debug)
 		printf("ok\n");
 	return (0);
-	
+
 errfin:
 	if (debug)
 		printf("not ok\n");
-	
+
 	return (-1);
 }
 
@@ -382,14 +382,14 @@ static int
 rpcent_test_getrpcbynumber(struct rpcent *rpc_model, void *mdata)
 {
 	struct rpcent *rpc;
-		
+
 	if (debug) {
 		printf("testing getrpcbyport() with the following data...\n");
 		dump_rpcent(rpc_model);
-	}	
-	
+	}
+
 	rpc = getrpcbynumber(rpc_model->r_number);
-	if ((rpcent_test_correctness(rpc, NULL) != 0) || 
+	if ((rpcent_test_correctness(rpc, NULL) != 0) ||
 	    ((compare_rpcent(rpc, rpc_model, NULL) != 0) &&
 	    (rpcent_check_ambiguity((struct rpcent_test_data *)mdata, rpc)
 	    != 0))) {
@@ -403,7 +403,7 @@ rpcent_test_getrpcbynumber(struct rpcent *rpc_model, void *mdata)
 	}
 }
 
-static int 
+static int
 rpcent_test_getrpcent(struct rpcent *rpc, void *mdata)
 {
 	/* Only correctness can be checked when doing 1-pass test for
@@ -427,10 +427,10 @@ main(int argc, char **argv)
 	char *snapshot_file;
 	int rv;
 	int c;
-	
+
 	if (argc < 2)
 		usage();
-		
+
 	snapshot_file = NULL;
 	while ((c = getopt(argc, argv, "nve2ds:")) != -1)
 		switch (c) {
@@ -455,18 +455,18 @@ main(int argc, char **argv)
 		default:
 			usage();
 		}
-	
+
 	TEST_DATA_INIT(rpcent, &td, clone_rpcent, free_rpcent);
 	TEST_DATA_INIT(rpcent, &td_snap, clone_rpcent, free_rpcent);
 	if (snapshot_file != NULL) {
-		if (access(snapshot_file, W_OK | R_OK) != 0) {		
+		if (access(snapshot_file, W_OK | R_OK) != 0) {
 			if (errno == ENOENT)
 				method = TEST_BUILD_SNAPSHOT;
 			else {
 				if (debug)
 					printf("can't access the file %s\n",
 				snapshot_file);
-			
+
 				rv = -1;
 				goto fin;
 			}
@@ -475,12 +475,12 @@ main(int argc, char **argv)
 				rv = 0;
 				goto fin;
 			}
-			
+
 			TEST_SNAPSHOT_FILE_READ(rpcent, snapshot_file,
 				&td_snap, rpcent_read_snapshot_func);
 		}
 	}
-		
+
 	rv = rpcent_fill_test_data(&td);
 	if (rv == -1)
 		return (-1);
@@ -490,7 +490,7 @@ main(int argc, char **argv)
 			rv = DO_1PASS_TEST(rpcent, &td,
 				rpcent_test_getrpcbyname, (void *)&td);
 		else
-			rv = DO_1PASS_TEST(rpcent, &td_snap, 
+			rv = DO_1PASS_TEST(rpcent, &td_snap,
 				rpcent_test_getrpcbyname, (void *)&td_snap);
 		break;
 	case TEST_GETRPCBYNUMBER:
@@ -498,7 +498,7 @@ main(int argc, char **argv)
 			rv = DO_1PASS_TEST(rpcent, &td,
 				rpcent_test_getrpcbynumber, (void *)&td);
 		else
-			rv = DO_1PASS_TEST(rpcent, &td_snap, 
+			rv = DO_1PASS_TEST(rpcent, &td_snap,
 				rpcent_test_getrpcbynumber, (void *)&td_snap);
 		break;
 	case TEST_GETRPCENT:
@@ -511,7 +511,7 @@ main(int argc, char **argv)
 		break;
 	case TEST_GETRPCENT_2PASS:
 			TEST_DATA_INIT(rpcent, &td_2pass, clone_rpcent, free_rpcent);
-			rv = rpcent_fill_test_data(&td_2pass);			
+			rv = rpcent_fill_test_data(&td_2pass);
 			if (rv != -1)
 				rv = DO_2PASS_TEST(rpcent, &td, &td_2pass,
 					compare_rpcent, NULL);
@@ -519,7 +519,7 @@ main(int argc, char **argv)
 		break;
 	case TEST_BUILD_SNAPSHOT:
 		if (snapshot_file != NULL)
-		    rv = TEST_SNAPSHOT_FILE_WRITE(rpcent, snapshot_file, &td, 
+		    rv = TEST_SNAPSHOT_FILE_WRITE(rpcent, snapshot_file, &td,
 			sdump_rpcent);
 		break;
 	default:
@@ -530,6 +530,6 @@ main(int argc, char **argv)
 fin:
 	TEST_DATA_DESTROY(rpcent, &td_snap);
 	TEST_DATA_DESTROY(rpcent, &td);
-	free(snapshot_file);	
+	free(snapshot_file);
 	return (rv);
 }
diff --git a/tools/regression/lib/libc/nss/test-getserv.c b/tools/regression/lib/libc/nss/test-getserv.c
index 79d42f0..31e4700 100644
--- a/tools/regression/lib/libc/nss/test-getserv.c
+++ b/tools/regression/lib/libc/nss/test-getserv.c
@@ -63,14 +63,14 @@ static void free_servent(struct servent *);
 static void sdump_servent(struct servent *, char *, size_t);
 static int servent_read_snapshot_func(struct servent *, char *);
 
-static int servent_check_ambiguity(struct servent_test_data *, 
+static int servent_check_ambiguity(struct servent_test_data *,
 	struct servent *);
 static int servent_fill_test_data(struct servent_test_data *);
 static int servent_test_correctness(struct servent *, void *);
 static int servent_test_getservbyname(struct servent *, void *);
 static int servent_test_getservbyport(struct servent *, void *);
 static int servent_test_getservent(struct servent *, void *);
-	
+
 static void usage(void)  __attribute__((__noreturn__));
 
 IMPLEMENT_TEST_DATA(servent)
@@ -83,32 +83,32 @@ clone_servent(struct servent *dest, struct servent const *src)
 {
 	assert(dest != NULL);
 	assert(src != NULL);
-	
+
 	char **cp;
 	int aliases_num;
-		
+
 	memset(dest, 0, sizeof(struct servent));
-	
+
 	if (src->s_name != NULL) {
 		dest->s_name = strdup(src->s_name);
 		assert(dest->s_name != NULL);
 	}
-	
+
 	if (src->s_proto != NULL) {
 		dest->s_proto = strdup(src->s_proto);
 		assert(dest->s_proto != NULL);
 	}
 	dest->s_port = src->s_port;
-	
+
 	if (src->s_aliases != NULL) {
 		aliases_num = 0;
 		for (cp = src->s_aliases; *cp; ++cp)
 			++aliases_num;
-	
+
 		dest->s_aliases = (char **)malloc((aliases_num+1) * (sizeof(char *)));
 		assert(dest->s_aliases != NULL);
 		memset(dest->s_aliases, 0, (aliases_num+1) * (sizeof(char *)));
-	
+
 		for (cp = src->s_aliases; *cp; ++cp) {
 			dest->s_aliases[cp - src->s_aliases] = strdup(*cp);
 			assert(dest->s_aliases[cp - src->s_aliases] != NULL);
@@ -116,52 +116,52 @@ clone_servent(struct servent *dest, struct servent const *src)
 	}
 }
 
-static void 
+static void
 free_servent(struct servent *serv)
 {
 	char **cp;
-	
+
 	assert(serv != NULL);
-	
+
 	free(serv->s_name);
 	free(serv->s_proto);
-	
+
 	for (cp = serv->s_aliases; *cp; ++cp)
 		free(*cp);
 	free(serv->s_aliases);
 }
 
-static  int 
+static  int
 compare_servent(struct servent *serv1, struct servent *serv2, void *mdata)
 {
 	char **c1, **c2;
-        
+
 	if (serv1 == serv2)
 		return 0;
-        
+
 	if ((serv1 == NULL) || (serv2 == NULL))
 		goto errfin;
-        
+
 	if ((strcmp(serv1->s_name, serv2->s_name) != 0) ||
 		(strcmp(serv1->s_proto, serv2->s_proto) != 0) ||
 		(serv1->s_port != serv2->s_port))
 			goto errfin;
-        
+
 	c1 = serv1->s_aliases;
 	c2 = serv2->s_aliases;
-	
+
 	if ((serv1->s_aliases == NULL) || (serv2->s_aliases == NULL))
 		goto errfin;
-	
+
 	for (;*c1 && *c2; ++c1, ++c2)
 		if (strcmp(*c1, *c2) != 0)
 			goto errfin;
-                
+
 	if ((*c1 != '\0') || (*c2 != '\0'))
 		goto errfin;
-        
+
 	return 0;
-	
+
 errfin:
 	if ((debug) && (mdata == NULL)) {
 		printf("following structures are not equal:\n");
@@ -177,14 +177,14 @@ sdump_servent(struct servent *serv, char *buffer, size_t buflen)
 {
 	char **cp;
 	int written;
-	
+
 	written = snprintf(buffer, buflen, "%s %d %s",
-		serv->s_name, ntohs(serv->s_port), serv->s_proto);	
+		serv->s_name, ntohs(serv->s_port), serv->s_proto);
 	buffer += written;
 	if (written > buflen)
 		return;
 	buflen -= written;
-			
+
 	if (serv->s_aliases != NULL) {
 		if (*(serv->s_aliases) != '\0') {
 			for (cp = serv->s_aliases; *cp; ++cp) {
@@ -193,9 +193,9 @@ sdump_servent(struct servent *serv, char *buffer, size_t buflen)
 				if (written > buflen)
 					return;
 				buflen -= written;
-				
+
 				if (buflen == 0)
-					return;				
+					return;
 			}
 		} else
 			snprintf(buffer, buflen, " noaliases");
@@ -212,7 +212,7 @@ servent_read_snapshot_func(struct servent *serv, char *line)
 
 	if (debug)
 		printf("1 line read from snapshot:\n%s\n", line);
-	
+
 	i = 0;
 	sl = NULL;
 	ps = line;
@@ -242,10 +242,10 @@ servent_read_snapshot_func(struct servent *serv, char *line)
 				if (sl == NULL) {
 					if (strcmp(s, "(null)") == 0)
 						return (0);
-										
+
 					sl = sl_init();
 					assert(sl != NULL);
-					
+
 					if (strcmp(s, "noaliases") != 0) {
 						ts = strdup(s);
 						assert(ts != NULL);
@@ -256,7 +256,7 @@ servent_read_snapshot_func(struct servent *serv, char *line)
 					assert(ts != NULL);
 					sl_add(sl, ts);
 				}
-			break;			
+			break;
 		};
 		++i;
 	}
@@ -267,16 +267,16 @@ servent_read_snapshot_func(struct servent *serv, char *line)
 		memset(serv, 0, sizeof(struct servent));
 		return (-1);
 	}
-	
+
 	sl_add(sl, NULL);
 	serv->s_aliases = sl->sl_str;
 
 	/* NOTE: is it a dirty hack or not? */
-	free(sl);	
+	free(sl);
 	return (0);
 }
 
-static void 
+static void
 dump_servent(struct servent *result)
 {
 	if (result != NULL) {
@@ -291,7 +291,7 @@ static int
 servent_fill_test_data(struct servent_test_data *td)
 {
 	struct servent *serv;
-		
+
 	setservent(1);
 	while ((serv = getservent()) != NULL) {
 		if (servent_test_correctness(serv, NULL) == 0)
@@ -300,7 +300,7 @@ servent_fill_test_data(struct servent_test_data *td)
 			return (-1);
 	}
 	endservent();
-	
+
 	return (0);
 }
 
@@ -311,42 +311,42 @@ servent_test_correctness(struct servent *serv, void *mdata)
 		printf("testing correctness with the following data:\n");
 		dump_servent(serv);
 	}
-	
+
 	if (serv == NULL)
 		goto errfin;
-	
+
 	if (serv->s_name == NULL)
 		goto errfin;
-	
+
 	if (serv->s_proto == NULL)
 		goto errfin;
-	
+
 	if (ntohs(serv->s_port < 0))
 		goto errfin;
-	
+
 	if (serv->s_aliases == NULL)
 		goto errfin;
-	
+
 	if (debug)
 		printf("correct\n");
-	
-	return (0);	
+
+	return (0);
 errfin:
 	if (debug)
 		printf("incorrect\n");
-	
+
 	return (-1);
 }
 
 /* servent_check_ambiguity() is needed when one port+proto is associated with
  * more than one service (these cases are usually marked as PROBLEM in
- * /etc/services. This functions is needed also when one service+proto is 
+ * /etc/services. This functions is needed also when one service+proto is
  * associated with several ports. We have to check all the servent structures
  * to make sure that serv really exists and correct */
 static int
 servent_check_ambiguity(struct servent_test_data *td, struct servent *serv)
 {
-	
+
 	return (TEST_DATA_FIND(servent, td, serv, compare_servent,
 		NULL) != NULL ? 0 : -1);
 }
@@ -356,7 +356,7 @@ servent_test_getservbyname(struct servent *serv_model, void *mdata)
 {
 	char **alias;
 	struct servent *serv;
-		
+
 	if (debug) {
 		printf("testing getservbyname() with the following data:\n");
 		dump_servent(serv_model);
@@ -365,32 +365,32 @@ servent_test_getservbyname(struct servent *serv_model, void *mdata)
 	serv = getservbyname(serv_model->s_name, serv_model->s_proto);
 	if (servent_test_correctness(serv, NULL) != 0)
 		goto errfin;
-	
+
 	if ((compare_servent(serv, serv_model, NULL) != 0) &&
-	    (servent_check_ambiguity((struct servent_test_data *)mdata, serv) 
+	    (servent_check_ambiguity((struct servent_test_data *)mdata, serv)
 	    !=0))
 	    goto errfin;
-	
+
 	for (alias = serv_model->s_aliases; *alias; ++alias) {
 		serv = getservbyname(*alias, serv_model->s_proto);
-		
+
 		if (servent_test_correctness(serv, NULL) != 0)
 			goto errfin;
-		
+
 		if ((compare_servent(serv, serv_model, NULL) != 0) &&
 		    (servent_check_ambiguity(
 		    (struct servent_test_data *)mdata, serv) != 0))
 		    goto errfin;
 	}
-	
+
 	if (debug)
 		printf("ok\n");
 	return (0);
-	
+
 errfin:
 	if (debug)
 		printf("not ok\n");
-	
+
 	return (-1);
 }
 
@@ -398,14 +398,14 @@ static int
 servent_test_getservbyport(struct servent *serv_model, void *mdata)
 {
 	struct servent *serv;
-		
+
 	if (debug) {
 		printf("testing getservbyport() with the following data...\n");
 		dump_servent(serv_model);
-	}	
-	
+	}
+
 	serv = getservbyport(serv_model->s_port, serv_model->s_proto);
-	if ((servent_test_correctness(serv, NULL) != 0) || 
+	if ((servent_test_correctness(serv, NULL) != 0) ||
 	    ((compare_servent(serv, serv_model, NULL) != 0) &&
 	    (servent_check_ambiguity((struct servent_test_data *)mdata, serv)
 	    != 0))) {
@@ -419,7 +419,7 @@ servent_test_getservbyport(struct servent *serv_model, void *mdata)
 	}
 }
 
-static int 
+static int
 servent_test_getservent(struct servent *serv, void *mdata)
 {
 	/* Only correctness can be checked when doing 1-pass test for
@@ -443,10 +443,10 @@ main(int argc, char **argv)
 	char *snapshot_file;
 	int rv;
 	int c;
-	
+
 	if (argc < 2)
 		usage();
-		
+
 	snapshot_file = NULL;
 	while ((c = getopt(argc, argv, "npe2ds:")) != -1)
 		switch (c) {
@@ -471,18 +471,18 @@ main(int argc, char **argv)
 		default:
 			usage();
 		}
-	
+
 	TEST_DATA_INIT(servent, &td, clone_servent, free_servent);
 	TEST_DATA_INIT(servent, &td_snap, clone_servent, free_servent);
 	if (snapshot_file != NULL) {
-		if (access(snapshot_file, W_OK | R_OK) != 0) {		
+		if (access(snapshot_file, W_OK | R_OK) != 0) {
 			if (errno == ENOENT)
 				method = TEST_BUILD_SNAPSHOT;
 			else {
 				if (debug)
 					printf("can't access the file %s\n",
 				snapshot_file);
-			
+
 				rv = -1;
 				goto fin;
 			}
@@ -491,12 +491,12 @@ main(int argc, char **argv)
 				rv = 0;
 				goto fin;
 			}
-			
+
 			TEST_SNAPSHOT_FILE_READ(servent, snapshot_file,
 				&td_snap, servent_read_snapshot_func);
 		}
 	}
-		
+
 	rv = servent_fill_test_data(&td);
 	if (rv == -1)
 		return (-1);
@@ -506,7 +506,7 @@ main(int argc, char **argv)
 			rv = DO_1PASS_TEST(servent, &td,
 				servent_test_getservbyname, (void *)&td);
 		else
-			rv = DO_1PASS_TEST(servent, &td_snap, 
+			rv = DO_1PASS_TEST(servent, &td_snap,
 				servent_test_getservbyname, (void *)&td_snap);
 		break;
 	case TEST_GETSERVBYPORT:
@@ -514,7 +514,7 @@ main(int argc, char **argv)
 			rv = DO_1PASS_TEST(servent, &td,
 				servent_test_getservbyport, (void *)&td);
 		else
-			rv = DO_1PASS_TEST(servent, &td_snap, 
+			rv = DO_1PASS_TEST(servent, &td_snap,
 				servent_test_getservbyport, (void *)&td_snap);
 		break;
 	case TEST_GETSERVENT:
@@ -527,7 +527,7 @@ main(int argc, char **argv)
 		break;
 	case TEST_GETSERVENT_2PASS:
 			TEST_DATA_INIT(servent, &td_2pass, clone_servent, free_servent);
-			rv = servent_fill_test_data(&td_2pass);			
+			rv = servent_fill_test_data(&td_2pass);
 			if (rv != -1)
 				rv = DO_2PASS_TEST(servent, &td, &td_2pass,
 					compare_servent, NULL);
@@ -535,7 +535,7 @@ main(int argc, char **argv)
 		break;
 	case TEST_BUILD_SNAPSHOT:
 		if (snapshot_file != NULL)
-		    rv = TEST_SNAPSHOT_FILE_WRITE(servent, snapshot_file, &td, 
+		    rv = TEST_SNAPSHOT_FILE_WRITE(servent, snapshot_file, &td,
 			sdump_servent);
 		break;
 	default:
@@ -546,6 +546,6 @@ main(int argc, char **argv)
 fin:
 	TEST_DATA_DESTROY(servent, &td_snap);
 	TEST_DATA_DESTROY(servent, &td);
-	free(snapshot_file);	
+	free(snapshot_file);
 	return (rv);
 }
diff --git a/tools/regression/lib/libc/nss/test-getusershell.c b/tools/regression/lib/libc/nss/test-getusershell.c
index 8682591..b7b835f 100644
--- a/tools/regression/lib/libc/nss/test-getusershell.c
+++ b/tools/regression/lib/libc/nss/test-getusershell.c
@@ -67,29 +67,29 @@ IMPLEMENT_TEST_DATA(usershell)
 IMPLEMENT_TEST_FILE_SNAPSHOT(usershell)
 IMPLEMENT_2PASS_TEST(usershell)
 
-static void 
+static void
 clone_usershell(struct usershell *dest, struct usershell const *src)
 {
 	assert(dest != NULL);
 	assert(src != NULL);
-	
+
 	if (src->path != NULL) {
 		dest->path = strdup(src->path);
 		assert(dest->path != NULL);
 	}
 }
 
-static int 
+static int
 compare_usershell(struct usershell *us1, struct usershell *us2, void *mdata)
 {
 	int rv;
-	
+
 	assert(us1 != NULL);
 	assert(us2 != NULL);
-	
+
 	dump_usershell(us1);
 	dump_usershell(us2);
-	
+
 	if (us1 == us2)
 		return (0);
 
@@ -99,17 +99,17 @@ compare_usershell(struct usershell *us1, struct usershell *us2, void *mdata)
 		dump_usershell(us1);
 		dump_usershell(us2);
 	}
-	
+
 	return (rv);
 }
 
-static void 
+static void
 free_usershell(struct usershell *us)
 {
 	free(us->path);
 }
 
-static void 
+static void
 sdump_usershell(struct usershell *us, char *buffer, size_t buflen)
 {
 	snprintf(buffer, buflen, "%s", us->path);
@@ -126,12 +126,12 @@ dump_usershell(struct usershell *us)
 		printf("(null)\n");
 }
 
-static int 
+static int
 usershell_read_snapshot_func(struct usershell *us, char *line)
 {
 	us->path = strdup(line);
 	assert(us->path != NULL);
-	
+
 	return (0);
 }
 
@@ -152,7 +152,7 @@ main(int argc, char **argv)
 	char *snapshot_file;
 	int rv;
 	int c;
-	
+
 	if (argc < 2)
 		usage();
 
@@ -170,10 +170,10 @@ main(int argc, char **argv)
 			usage();
 		}
 	}
-	
+
 	TEST_DATA_INIT(usershell, &td, clone_usershell, free_usershell);
 	TEST_DATA_INIT(usershell, &td_snap, clone_usershell, free_usershell);
-			
+
 	setusershell();
 	while ((ushell.path = getusershell()) != NULL) {
 		if (debug) {
@@ -183,17 +183,17 @@ main(int argc, char **argv)
 		TEST_DATA_APPEND(usershell, &td, &ushell);
 	}
 	endusershell();
-	
-	
+
+
 	if (snapshot_file != NULL) {
-		if (access(snapshot_file, W_OK | R_OK) != 0) {		
+		if (access(snapshot_file, W_OK | R_OK) != 0) {
 			if (errno == ENOENT)
 				method = TEST_BUILD_SNAPSHOT;
 			else {
 				if (debug)
 				    printf("can't access the snapshot file %s\n",
 				    snapshot_file);
-			
+
 				rv = -1;
 				goto fin;
 			}
@@ -207,7 +207,7 @@ main(int argc, char **argv)
 			}
 		}
 	}
-		
+
 	switch (method) {
 	case TEST_GETUSERSHELL:
 		if (snapshot_file != NULL) {
@@ -217,7 +217,7 @@ main(int argc, char **argv)
 		break;
 	case TEST_BUILD_SNAPSHOT:
 		if (snapshot_file != NULL) {
-		    rv = TEST_SNAPSHOT_FILE_WRITE(usershell, snapshot_file, &td, 
+		    rv = TEST_SNAPSHOT_FILE_WRITE(usershell, snapshot_file, &td,
 			sdump_usershell);
 		}
 		break;
diff --git a/tools/regression/lib/libc/nss/testutil.h b/tools/regression/lib/libc/nss/testutil.h
index acd69ac..711c49f 100644
--- a/tools/regression/lib/libc/nss/testutil.h
+++ b/tools/regression/lib/libc/nss/testutil.h
@@ -53,8 +53,8 @@ int __##ent##_test_data_compare(struct ent##_test_data *,		\
 	void *), void *);						\
 struct ent *__##ent##_test_data_find(struct ent##_test_data *, struct ent *,\
 	int (*)(struct ent *, struct ent *, void *), void *);		\
-void __##ent##_test_data_clear(struct ent##_test_data *);			
-	
+void __##ent##_test_data_clear(struct ent##_test_data *);
+
 #define TEST_DATA_INIT(ent, td, clonef, freef)\
 	__##ent##_test_data_init(td, clonef, freef)
 #define TEST_DATA_DESTROY(ent, td) __##ent##_test_data_destroy(td)
@@ -191,9 +191,8 @@ __##ent##_test_data_clear(struct ent##_test_data *td)			\
 		td->free_func(&e->data);				\
 		free(e);						\
 	}								\
-}									
+}
 
-									\
 #define DECLARE_TEST_FILE_SNAPSHOT(ent)					\
 struct ent##_snp_param {						\
 	FILE *fp;							\
@@ -204,8 +203,8 @@ int __##ent##_snapshot_write_func(struct ent *, void *);		\
 int __##ent##_snapshot_write(char const *, struct ent##_test_data *,	\
 	void (*)(struct ent *, char *, size_t));			\
 int __##ent##_snapshot_read(char const *, struct ent##_test_data *,	\
-	int (*)(struct ent *, char *));	
-		
+	int (*)(struct ent *, char *));
+
 #define TEST_SNAPSHOT_FILE_WRITE(ent, fname, td, f)			\
 	__##ent##_snapshot_write(fname, td, f)
 #define TEST_SNAPSHOT_FILE_READ(ent, fname, td, f)			\
@@ -294,8 +293,8 @@ fin:									\
 #define DECLARE_1PASS_TEST(ent)						\
 int __##ent##_1pass_test(struct ent##_test_data *, 			\
 	int (*)(struct ent *, void *),					\
-	void *);							
-	
+	void *);
+
 #define DO_1PASS_TEST(ent, td, f, mdata)				\
 	__##ent##_1pass_test(td, f, mdata)
 
@@ -318,7 +317,7 @@ int __##ent##_2pass_test(struct ent##_test_data *, 			\
 
 #define DO_2PASS_TEST(ent, td1, td2, f, mdata)				\
 	__##ent##_2pass_test(td1, td2, f, mdata)
-	
+
 #define IMPLEMENT_2PASS_TEST(ent)					\
 int									\
 __##ent##_2pass_test(struct ent##_test_data *td1,			\