(char *)0 -> NULL cleanup. From NetBSD

1 files changed, 10 insertions, 10 deletions

diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index 232747892a3..e1a2b1d45d8 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ftpcmd.y,v 1.18 1999/12/08 13:15:21 itojun Exp $	*/
+/*	$OpenBSD: ftpcmd.y,v 1.19 2000/01/15 05:10:55 ericj Exp $	*/
 /*	$NetBSD: ftpcmd.y,v 1.7 1996/04/08 19:03:11 jtc Exp $	*/
 
 /*
@@ -47,7 +47,7 @@
 #if 0
 static char sccsid[] = "@(#)ftpcmd.y	8.3 (Berkeley) 4/6/94";
 #else
-static char rcsid[] = "$OpenBSD: ftpcmd.y,v 1.18 1999/12/08 13:15:21 itojun Exp $";
+static char rcsid[] = "$OpenBSD: ftpcmd.y,v 1.19 2000/01/15 05:10:55 ericj Exp $";
 #endif
 #endif /* not lint */
 
@@ -439,7 +439,7 @@ cmd
 	| RETR check_login SP pathname CRLF
 		{
 			if ($2 && $4 != NULL)
-				retrieve((char *) 0, $4);
+				retrieve(NULL, $4);
 			if ($4 != NULL)
 				free($4);
 		}
@@ -506,7 +506,7 @@ cmd
 				if (fromname) {
 					renamecmd(fromname, $4);
 					free(fromname);
-					fromname = (char *) 0;
+					fromname = NULL;
 				} else {
 					reply(503, 
 					  "Bad sequence of commands.");
@@ -533,7 +533,7 @@ cmd
 		}
 	| HELP CRLF
 		{
-			help(cmdtab, (char *) 0);
+			help(cmdtab, NULL);
 		}
 	| HELP SP STRING CRLF
 		{
@@ -546,7 +546,7 @@ cmd
 				if (*cp)
 					help(sitetab, cp);
 				else
-					help(sitetab, (char *) 0);
+					help(sitetab, NULL);
 			} else
 				help(cmdtab, $3);
 
@@ -583,7 +583,7 @@ cmd
 		}
 	| SITE SP HELP CRLF
 		{
-			help(sitetab, (char *) 0);
+			help(sitetab, NULL);
 		}
 	| SITE SP HELP SP STRING CRLF
 		{
@@ -740,7 +740,7 @@ rcmd
 			restart_point = (off_t) 0;
 			if ($2 && $4) {
 				fromname = renamefrom($4);
-				if (fromname == (char *) 0 && $4) {
+				if (fromname == NULL && $4) {
 					free($4);
 				}
 			} else {
@@ -752,7 +752,7 @@ rcmd
 	| REST check_login SP byte_size CRLF
 		{
 			if ($2) {
-			    fromname = (char *) 0;
+			    fromname = NULL;
 			    restart_point = $4;	/* XXX $4 is only "int" */
 			    reply(350, "Restarting at %qd. %s", restart_point,
 			       "Send STORE or RETRIEVE to initiate transfer.");
@@ -1268,7 +1268,7 @@ yylex()
 				*cp = '\0';
 			}
 #ifdef HASSETPROCTITLE
-			if (strncasecmp(cbuf, "PASS", 4) != NULL) {
+			if (strncasecmp(cbuf, "PASS", 4) != 0) {
 				if ((cp = strpbrk(cbuf, "\n"))) {
 					c = *cp;
 					*cp = '\0';