(foo *)NULL -> NULL

5 files changed, 17 insertions, 17 deletions

diff --git a/usr.bin/ar/archive.c b/usr.bin/ar/archive.c
index e437bdb9fa1..44776658572 100644
--- a/usr.bin/ar/archive.c
+++ b/usr.bin/ar/archive.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: archive.c,v 1.7 1995/03/26 03:27:46 glass Exp $	*/
-/*	$OpenBSD: archive.c,v 1.3 1997/05/31 08:17:18 deraadt Exp $	*/
+/*	$OpenBSD: archive.c,v 1.4 1997/06/17 20:47:08 kstailey Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -125,7 +125,7 @@ close_archive(fd)
 #define	AR_ATOI(from, to, len, base) { \
 	memmove(buf, from, len); \
 	buf[len] = '\0'; \
-	to = strtol(buf, (char **)NULL, base); \
+	to = strtol(buf, NULL, base); \
 }
 
 /*
diff --git a/usr.bin/ar/delete.c b/usr.bin/ar/delete.c
index b138dacbab0..ed9034b6978 100644
--- a/usr.bin/ar/delete.c
+++ b/usr.bin/ar/delete.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: delete.c,v 1.2 1996/06/26 05:31:19 deraadt Exp $	*/
+/*	$OpenBSD: delete.c,v 1.3 1997/06/17 20:47:09 kstailey Exp $	*/
 /*	$NetBSD: delete.c,v 1.5 1995/03/26 03:27:52 glass Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)delete.c	8.3 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: delete.c,v 1.2 1996/06/26 05:31:19 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: delete.c,v 1.3 1997/06/17 20:47:09 kstailey Exp $";
 #endif
 #endif /* not lint */
 
@@ -83,7 +83,7 @@ delete(argv)
 			skip_arobj(afd);
 			continue;
 		}
-		put_arobj(&cf, (struct stat *)NULL);
+		put_arobj(&cf, NULL);
 	}
 
 	size = lseek(tfd, (off_t)0, SEEK_CUR);
diff --git a/usr.bin/ar/move.c b/usr.bin/ar/move.c
index 7bc1d7668a0..d99f1c3a483 100644
--- a/usr.bin/ar/move.c
+++ b/usr.bin/ar/move.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: move.c,v 1.2 1996/06/26 05:31:21 deraadt Exp $	*/
+/*	$OpenBSD: move.c,v 1.3 1997/06/17 20:47:09 kstailey Exp $	*/
 /*	$NetBSD: move.c,v 1.5 1995/03/26 03:27:57 glass Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)move.c	8.3 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: move.c,v 1.2 1996/06/26 05:31:21 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: move.c,v 1.3 1997/06/17 20:47:09 kstailey Exp $";
 #endif
 #endif /* not lint */
 
@@ -97,7 +97,7 @@ move(argv)
 			if (options & AR_V)
 				(void)printf("m - %s\n", file);
 			cf.wfd = tfd2;
-			put_arobj(&cf, (struct stat *)NULL);
+			put_arobj(&cf, NULL);
 			continue;
 		}
 		if (mods && compare(posname)) {
@@ -105,12 +105,12 @@ move(argv)
 			if (options & AR_B)
 				curfd = tfd3;
 			cf.wfd = curfd;
-			put_arobj(&cf, (struct stat *)NULL);
+			put_arobj(&cf, NULL);
 			if (options & AR_A)
 				curfd = tfd3;
 		} else {
 			cf.wfd = curfd;
-			put_arobj(&cf, (struct stat *)NULL);
+			put_arobj(&cf, NULL);
 		}
 	}
 
diff --git a/usr.bin/ar/replace.c b/usr.bin/ar/replace.c
index efce3c37d75..62f6975498a 100644
--- a/usr.bin/ar/replace.c
+++ b/usr.bin/ar/replace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: replace.c,v 1.2 1996/06/26 05:31:23 deraadt Exp $	*/
+/*	$OpenBSD: replace.c,v 1.3 1997/06/17 20:47:09 kstailey Exp $	*/
 /*	$NetBSD: replace.c,v 1.6 1995/03/26 03:28:01 glass Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)replace.c	8.3 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: replace.c,v 1.2 1996/06/26 05:31:23 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: replace.c,v 1.3 1997/06/17 20:47:09 kstailey Exp $";
 #endif
 #endif /* not lint */
 
@@ -131,13 +131,13 @@ replace(argv)
 				curfd = tfd2;
 			/* Read and write to an archive; pad on both. */
 			SETCF(afd, archive, curfd, tname, RPAD|WPAD);
-			put_arobj(&cf, (struct stat *)NULL);
+			put_arobj(&cf, NULL);
 			if (options & AR_A)
 				curfd = tfd2;
 		} else {
 			/* Read and write to an archive; pad on both. */
 useold:			SETCF(afd, archive, curfd, tname, RPAD|WPAD);
-			put_arobj(&cf, (struct stat *)NULL);
+			put_arobj(&cf, NULL);
 		}
 	}
 
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index 33c67f9b4e7..3cc692d2824 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: at.c,v 1.12 1997/06/12 16:57:44 kstailey Exp $	*/
+/*	$OpenBSD: at.c,v 1.13 1997/06/17 20:48:04 kstailey Exp $	*/
 /*	$NetBSD: at.c,v 1.4 1995/03/25 18:13:31 glass Exp $	*/
 
 /*
@@ -73,7 +73,7 @@ enum { ATQ, ATRM, AT, BATCH, CAT };	/* what program we want to run */
 
 /* File scope variables */
 #ifndef lint
-static char rcsid[] = "$OpenBSD: at.c,v 1.12 1997/06/12 16:57:44 kstailey Exp $";
+static char rcsid[] = "$OpenBSD: at.c,v 1.13 1997/06/17 20:48:04 kstailey Exp $";
 #endif
 
 char *no_export[] =
@@ -292,7 +292,7 @@ writefile(runtimer, queue)
 			mailname = pass_entry->pw_name;
 	}
 
-	if (atinput != (char *) NULL) {
+	if (atinput != NULL) {
 		fpin = freopen(atinput, "r", stdin);
 		if (fpin == NULL)
 			perr("Cannot open input file");