(foo *)NULL -> NULL

5 files changed, 32 insertions, 32 deletions

diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index 97b91a61510..a7c886122d0 100644
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar_io.c,v 1.13 1997/03/25 09:30:19 millert Exp $	*/
+/*	$OpenBSD: ar_io.c,v 1.14 1997/06/18 18:48:23 kstailey Exp $	*/
 /*	$NetBSD: ar_io.c,v 1.5 1996/03/26 23:54:13 mrg Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)ar_io.c	8.2 (Berkeley) 4/18/94";
 #else
-static char rcsid[] = "$OpenBSD: ar_io.c,v 1.13 1997/03/25 09:30:19 millert Exp $";
+static char rcsid[] = "$OpenBSD: ar_io.c,v 1.14 1997/06/18 18:48:23 kstailey Exp $";
 #endif
 #endif /* not lint */
 
@@ -1183,7 +1183,7 @@ ar_next()
 	if (sigprocmask(SIG_BLOCK, &s_mask, &o_mask) < 0)
 		syswarn(0, errno, "Unable to set signal mask");
 	ar_close();
-	if (sigprocmask(SIG_SETMASK, &o_mask, (sigset_t *)NULL) < 0)
+	if (sigprocmask(SIG_SETMASK, &o_mask, NULL) < 0)
 		syswarn(0, errno, "Unable to restore signal mask");
 
 	if (done || !wr_trail || strcmp(NM_TAR, argv0) == 0)
diff --git a/bin/pax/ar_subs.c b/bin/pax/ar_subs.c
index 6d1c68c8881..252fc41af3f 100644
--- a/bin/pax/ar_subs.c
+++ b/bin/pax/ar_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar_subs.c,v 1.7 1997/06/04 00:15:14 millert Exp $	*/
+/*	$OpenBSD: ar_subs.c,v 1.8 1997/06/18 18:48:24 kstailey Exp $	*/
 /*	$NetBSD: ar_subs.c,v 1.5 1995/03/21 09:07:06 cgd Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)ar_subs.c	8.2 (Berkeley) 4/18/94";
 #else
-static char rcsid[] = "$OpenBSD: ar_subs.c,v 1.7 1997/06/04 00:15:14 millert Exp $";
+static char rcsid[] = "$OpenBSD: ar_subs.c,v 1.8 1997/06/18 18:48:24 kstailey Exp $";
 #endif
 #endif /* not lint */
 
@@ -107,7 +107,7 @@ list()
 	if (vflag && ((uidtb_start() < 0) || (gidtb_start() < 0)))
 		return;
 
-	now = time((time_t *)NULL);
+	now = time(NULL);
 
 	/*
 	 * step through the archive until the format says it is done
@@ -150,7 +150,7 @@ list()
 	 * the patterns supplied by the user were all matched
 	 */
 	(void)(*frmt->end_rd)();
-	(void)sigprocmask(SIG_BLOCK, &s_mask, (sigset_t *)NULL);
+	(void)sigprocmask(SIG_BLOCK, &s_mask, NULL);
 	ar_close();
 	pat_chk();
 }
@@ -194,7 +194,7 @@ extract()
 	if (iflag && (name_start() < 0))
 		return;
 
-	now = time((time_t *)NULL);
+	now = time(NULL);
 
 	/*
 	 * step through each entry on the archive until the format read routine
@@ -359,7 +359,7 @@ extract()
 	 * to avoid chance for multiple entry into the cleanup code.
 	 */
 	(void)(*frmt->end_rd)();
-	(void)sigprocmask(SIG_BLOCK, &s_mask, (sigset_t *)NULL);
+	(void)sigprocmask(SIG_BLOCK, &s_mask, NULL);
 	ar_close();
 	proc_dir();
 	pat_chk();
@@ -415,7 +415,7 @@ wr_archive(arcn, is_app)
 	 */
 	wr_one = is_app;
 
-	now = time((time_t *)NULL);
+	now = time(NULL);
 
 	/*
 	 * while there are files to archive, process them one at at time
@@ -552,7 +552,7 @@ wr_archive(arcn, is_app)
 		(*frmt->end_wr)();
 		wr_fin();
 	}
-	(void)sigprocmask(SIG_BLOCK, &s_mask, (sigset_t *)NULL);
+	(void)sigprocmask(SIG_BLOCK, &s_mask, NULL);
 	ar_close();
 	if (tflag)
 		proc_dir();
@@ -980,7 +980,7 @@ copy()
 	 * patterns were selected block off signals to avoid chance for
 	 * multiple entry into the cleanup code.
 	 */
-	(void)sigprocmask(SIG_BLOCK, &s_mask, (sigset_t *)NULL);
+	(void)sigprocmask(SIG_BLOCK, &s_mask, NULL);
 	ar_close();
 	proc_dir();
 	ftree_chk();
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index 3cd1f0f08c0..d6e34bb3fd3 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gen_subs.c,v 1.5 1997/06/04 00:15:16 millert Exp $	*/
+/*	$OpenBSD: gen_subs.c,v 1.6 1997/06/18 18:48:25 kstailey Exp $	*/
 /*	$NetBSD: gen_subs.c,v 1.5 1995/03/21 09:07:26 cgd Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)gen_subs.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: gen_subs.c,v 1.5 1997/06/04 00:15:16 millert Exp $";
+static char rcsid[] = "$OpenBSD: gen_subs.c,v 1.6 1997/06/18 18:48:25 kstailey Exp $";
 #endif
 #endif /* not lint */
 
@@ -187,7 +187,7 @@ ls_tty(arcn)
 		/*
 		 * no locale specified format
 		 */
-		if ((arcn->sb.st_mtime + SIXMONTHS) <= time((time_t *)NULL))
+		if ((arcn->sb.st_mtime + SIXMONTHS) <= time(NULL))
 			timefrmt = OLDFRMT;
 		else
 			timefrmt = CURFRMT;
diff --git a/bin/pax/options.c b/bin/pax/options.c
index bf6047293ab..4ad7e9e7ccd 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options.c,v 1.25 1997/05/29 15:47:18 millert Exp $	*/
+/*	$OpenBSD: options.c,v 1.26 1997/06/18 18:48:26 kstailey Exp $	*/
 /*	$NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
 #else
-static char rcsid[] = "$OpenBSD: options.c,v 1.25 1997/05/29 15:47:18 millert Exp $";
+static char rcsid[] = "$OpenBSD: options.c,v 1.26 1997/06/18 18:48:26 kstailey Exp $";
 #endif
 #endif /* not lint */
 
@@ -817,9 +817,9 @@ tar_options(argc, argv)
 		{
 			int sawpat = 0;
 				
-			while (*argv != (char *)NULL) {
+			while (*argv != NULL) {
 				if (strcmp(*argv, "-C") == 0) {
-					if(*++argv == (char *)NULL)
+					if(*++argv == NULL)
 						break;
 					chdname = *argv++;
 
@@ -840,14 +840,14 @@ tar_options(argc, argv)
 		break;
 	case ARCHIVE:
 	case APPND:
-		if (chdname != (char *)NULL) {	/* initial chdir() */
+		if (chdname != NULL) {	/* initial chdir() */
 			if (ftree_add(chdname, 1) < 0)
 				tar_usage();
 		}
 
-		while (*argv != (char *)NULL) {
+		while (*argv != NULL) {
 			if (!strcmp(*argv, "-C")) {
-				if (*++argv == (char *)NULL)
+				if (*++argv == NULL)
 					break;
 				if (ftree_add(*argv++, 1) < 0)
 					tar_usage();
@@ -862,9 +862,9 @@ tar_options(argc, argv)
 		maxflt = 0;
 		break;
 	}
-	if (!fstdin && ((arcname == (char *)NULL) || (*arcname == '\0'))) {
+	if (!fstdin && ((arcname == NULL) || (*arcname == '\0'))) {
 		arcname = getenv("TAPE");
-		if ((arcname == (char *)NULL) || (*arcname == '\0'))
+		if ((arcname == NULL) || (*arcname == '\0'))
 			arcname = _PATH_DEFTAPE;
 	}
 }
@@ -1132,12 +1132,12 @@ cpio_options(argc, argv)
 	switch (act) {
 		case LIST:
 		case EXTRACT:
-			while (*argv != (char *)NULL)
+			while (*argv != NULL)
 				if (pat_add(*argv++, NULL) < 0)
 					cpio_usage();
 			break;
 		case COPY:
-			if (*argv == (char *)NULL) {
+			if (*argv == NULL) {
 				paxwarn(0, "Destination directory was not supplied");
 				cpio_usage();
 			}
@@ -1149,7 +1149,7 @@ cpio_options(argc, argv)
 			/* FALL THROUGH */
 		case ARCHIVE:
 		case APPND:
-			if (*argv != (char *)NULL)
+			if (*argv != NULL)
 				cpio_usage();
 			/*
 			 * no read errors allowed on updates/append operation!
diff --git a/bin/pax/sel_subs.c b/bin/pax/sel_subs.c
index 8069ccb6013..473fe6a9c52 100644
--- a/bin/pax/sel_subs.c
+++ b/bin/pax/sel_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sel_subs.c,v 1.3 1996/06/23 14:20:41 deraadt Exp $	*/
+/*	$OpenBSD: sel_subs.c,v 1.4 1997/06/18 18:48:27 kstailey Exp $	*/
 /*	$NetBSD: sel_subs.c,v 1.5 1995/03/21 09:07:42 cgd Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)sel_subs.c	8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$OpenBSD: sel_subs.c,v 1.3 1996/06/23 14:20:41 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: sel_subs.c,v 1.4 1997/06/18 18:48:27 kstailey Exp $";
 #endif
 #endif /* not lint */
 
@@ -156,7 +156,7 @@ usr_add(str)
 #		ifdef NET2_STAT
 		uid = (uid_t)atoi(str+1);
 #		else
-		uid = (uid_t)strtoul(str+1, (char **)NULL, 10);
+		uid = (uid_t)strtoul(str+1, NULL, 10);
 #		endif
 	endpwent();
 
@@ -269,7 +269,7 @@ grp_add(str)
 #		ifdef NET2_STAT
 		gid = (gid_t)atoi(str+1);
 #		else
-		gid = (gid_t)strtoul(str+1, (char **)NULL, 10);
+		gid = (gid_t)strtoul(str+1, NULL, 10);
 #		endif
 	endgrent();
 
@@ -449,7 +449,7 @@ trng_add(str)
 	/*
 	 * start off with the current time
 	 */
-	pt->low_time = pt->high_time = time((time_t *)NULL);
+	pt->low_time = pt->high_time = time(NULL);
 	if (*str != '\0') {
 		/*
 		 * add lower limit