summaryrefslogtreecommitdiff
path: root/libexec/talkd
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2016-03-16 15:41:12 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2016-03-16 15:41:12 +0000
commitd8ebeb5c1882685478f7aff85d3cfd52cb45385b (patch)
tree6a871a498e943d359bc98a18b415e916ac0ef2b6 /libexec/talkd
parent043c400f909ee0b4431a6657c5b1550df8ab4c83 (diff)
More "(<blah> *)0" -> NULL, avoiding any stdarg functions.
Feedback millert@ kettenis@
Diffstat (limited to 'libexec/talkd')
-rw-r--r--libexec/talkd/process.c8
-rw-r--r--libexec/talkd/table.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/libexec/talkd/process.c b/libexec/talkd/process.c
index f53d485bb02..6bf61e39e27 100644
--- a/libexec/talkd/process.c
+++ b/libexec/talkd/process.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: process.c,v 1.22 2016/02/01 07:25:51 mestre Exp $ */
+/* $OpenBSD: process.c,v 1.23 2016/03/16 15:41:10 krw Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -112,7 +112,7 @@ process_request(CTL_MSG *mp, CTL_RESPONSE *rp)
case LEAVE_INVITE:
ptr = find_request(mp);
- if (ptr != (CTL_MSG *)0) {
+ if (ptr != NULL) {
rp->id_num = htonl(ptr->id_num);
rp->answer = SUCCESS;
} else
@@ -121,7 +121,7 @@ process_request(CTL_MSG *mp, CTL_RESPONSE *rp)
case LOOK_UP:
ptr = find_match(mp);
- if (ptr != (CTL_MSG *)0) {
+ if (ptr != NULL) {
rp->id_num = htonl(ptr->id_num);
rp->addr = ptr->addr;
rp->addr.sa_family = ptr->addr.sa_family;
@@ -157,7 +157,7 @@ do_announce(CTL_MSG *mp, CTL_RESPONSE *rp)
}
hp = gethostbyaddr((char *)&satosin(&mp->ctl_addr)->sin_addr,
sizeof(struct in_addr), AF_INET);
- if (hp == (struct hostent *)0) {
+ if (hp == NULL) {
rp->answer = MACHINE_UNKNOWN;
return;
}
diff --git a/libexec/talkd/table.c b/libexec/talkd/table.c
index b341ba2908b..1cf4d05da6c 100644
--- a/libexec/talkd/table.c
+++ b/libexec/talkd/table.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: table.c,v 1.17 2016/02/01 07:25:51 mestre Exp $ */
+/* $OpenBSD: table.c,v 1.18 2016/03/16 15:41:10 krw Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -107,7 +107,7 @@ find_match(CTL_MSG *request)
if (debug)
syslog(LOG_DEBUG, "find_match: not found");
- return ((CTL_MSG *)0);
+ return (NULL);
}
/*
@@ -149,7 +149,7 @@ find_request(CTL_MSG *request)
return (&ptr->request);
}
}
- return ((CTL_MSG *)0);
+ return (NULL);
}
void