summaryrefslogtreecommitdiff
path: root/usr.bin/mail
diff options
context:
space:
mode:
authorAnil Madhavapeddy <avsm@cvs.openbsd.org>2003-10-24 20:32:07 +0000
committerAnil Madhavapeddy <avsm@cvs.openbsd.org>2003-10-24 20:32:07 +0000
commit3a8468223c61342a89c495f6884b0c31ff81e7fb (patch)
tree590e23133794aebee1bee8088bd9497d3b1c2f51 /usr.bin/mail
parentfda603321a4c0bb3ea49b921110a0a4a11927721 (diff)
dont compare int to NULL, millert@ ok
Diffstat (limited to 'usr.bin/mail')
-rw-r--r--usr.bin/mail/cmd2.c10
-rw-r--r--usr.bin/mail/collect.c6
-rw-r--r--usr.bin/mail/lex.c8
3 files changed, 12 insertions, 12 deletions
diff --git a/usr.bin/mail/cmd2.c b/usr.bin/mail/cmd2.c
index d55105c48cf..03c03c17a06 100644
--- a/usr.bin/mail/cmd2.c
+++ b/usr.bin/mail/cmd2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd2.c,v 1.12 2003/06/03 02:56:11 millert Exp $ */
+/* $OpenBSD: cmd2.c,v 1.13 2003/10/24 20:32:06 avsm Exp $ */
/* $NetBSD: cmd2.c,v 1.7 1997/05/17 19:55:10 pk Exp $ */
/*
@@ -34,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)cmd2.c 8.1 (Berkeley) 6/6/93";
#else
-static const char rcsid[] = "$OpenBSD: cmd2.c,v 1.12 2003/06/03 02:56:11 millert Exp $";
+static const char rcsid[] = "$OpenBSD: cmd2.c,v 1.13 2003/10/24 20:32:06 avsm Exp $";
#endif
#endif /* not lint */
@@ -76,7 +76,7 @@ next(void *v)
for (ip = msgvec; *ip != NULL; ip++)
if (*ip > mdot)
break;
- if (*ip == NULL)
+ if (*ip == 0)
ip = msgvec;
ip2 = ip;
do {
@@ -87,7 +87,7 @@ next(void *v)
}
if (*ip2 != NULL)
ip2++;
- if (*ip2 == NULL)
+ if (*ip2 == 0)
ip2 = msgvec;
} while (ip2 != ip);
puts("No messages applicable");
@@ -162,7 +162,7 @@ save1(char *str, int mark, char *cmd, struct ignoretab *ignore)
return(1);
if (!f) {
*msgvec = first(0, MMNORM);
- if (*msgvec == NULL) {
+ if (*msgvec == 0) {
printf("No messages to %s.\n", cmd);
return(1);
}
diff --git a/usr.bin/mail/collect.c b/usr.bin/mail/collect.c
index 27dec8c8f40..66f83b486b7 100644
--- a/usr.bin/mail/collect.c
+++ b/usr.bin/mail/collect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: collect.c,v 1.25 2003/06/03 02:56:11 millert Exp $ */
+/* $OpenBSD: collect.c,v 1.26 2003/10/24 20:32:06 avsm Exp $ */
/* $NetBSD: collect.c,v 1.9 1997/07/09 05:25:45 mikel Exp $ */
/*
@@ -34,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)collect.c 8.2 (Berkeley) 4/19/94";
#else
-static const char rcsid[] = "$OpenBSD: collect.c,v 1.25 2003/06/03 02:56:11 millert Exp $";
+static const char rcsid[] = "$OpenBSD: collect.c,v 1.26 2003/10/24 20:32:06 avsm Exp $";
#endif
#endif /* not lint */
@@ -527,7 +527,7 @@ forward(char *ms, FILE *fp, char *fn, int f)
return(0);
if (*msgvec == 0) {
*msgvec = first(0, MMNORM);
- if (*msgvec == NULL) {
+ if (*msgvec == 0) {
puts("No appropriate messages");
return(0);
}
diff --git a/usr.bin/mail/lex.c b/usr.bin/mail/lex.c
index c45faa646cc..cbded97fbf4 100644
--- a/usr.bin/mail/lex.c
+++ b/usr.bin/mail/lex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lex.c,v 1.29 2003/10/13 00:46:08 tedu Exp $ */
+/* $OpenBSD: lex.c,v 1.30 2003/10/24 20:32:06 avsm Exp $ */
/* $NetBSD: lex.c,v 1.10 1997/05/17 19:55:13 pk Exp $ */
/*
@@ -34,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)lex.c 8.2 (Berkeley) 4/20/95";
#else
-static const char rcsid[] = "$OpenBSD: lex.c,v 1.29 2003/10/13 00:46:08 tedu Exp $";
+static const char rcsid[] = "$OpenBSD: lex.c,v 1.30 2003/10/24 20:32:06 avsm Exp $";
#endif
#endif /* not lint */
@@ -407,7 +407,7 @@ execute(char *linebuf, int contxt)
com->c_msgmask);
msgvec[1] = NULL;
}
- if (*msgvec == NULL) {
+ if (*msgvec == 0) {
puts("No applicable messages");
break;
}
@@ -437,7 +437,7 @@ execute(char *linebuf, int contxt)
com->c_msgmask);
msgvec[1] = NULL;
}
- if (*msgvec == NULL) {
+ if (*msgvec == 0) {
puts("No applicable messages");
break;
}