diff options
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ftpd/ftpd.c | 4 | ||||
| -rw-r--r-- | libexec/getty/main.c | 6 | ||||
| -rw-r--r-- | libexec/getty/subr.c | 4 | ||||
| -rw-r--r-- | libexec/ld.so/dlfcn.c | 4 | ||||
| -rw-r--r-- | libexec/talkd/process.c | 8 | ||||
| -rw-r--r-- | libexec/talkd/table.c | 6 |
6 files changed, 16 insertions, 16 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 247061eca75..0da9f709e71 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftpd.c,v 1.212 2015/12/12 20:09:28 mmcc Exp $ */ +/* $OpenBSD: ftpd.c,v 1.213 2016/03/16 15:41:10 krw Exp $ */ /* $NetBSD: ftpd.c,v 1.15 1995/06/03 22:46:47 mycroft Exp $ */ /* @@ -2140,7 +2140,7 @@ renamefrom(char *name) if (stat(name, &st) < 0) { perror_reply(550, name); - return ((char *)0); + return (NULL); } reply(350, "File exists, ready for destination name"); return (name); diff --git a/libexec/getty/main.c b/libexec/getty/main.c index bcc455ab888..05b1189c4a0 100644 --- a/libexec/getty/main.c +++ b/libexec/getty/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.41 2015/11/16 18:37:30 deraadt Exp $ */ +/* $OpenBSD: main.c,v 1.42 2016/03/16 15:41:10 krw Exp $ */ /*- * Copyright (c) 1980, 1993 @@ -306,14 +306,14 @@ main(int argc, char *argv[]) exit(1); } signal(SIGINT, SIG_DFL); - for (i = 0; environ[i] != (char *)0; i++) + for (i = 0; environ[i] != NULL; i++) env[i] = environ[i]; makeenv(&env[i]); limit.rlim_max = RLIM_INFINITY; limit.rlim_cur = RLIM_INFINITY; (void)setrlimit(RLIMIT_CPU, &limit); - execle(LO, "login", "-p", "--", name, (char *)0, env); + execle(LO, "login", "-p", "--", name, NULL, env); syslog(LOG_ERR, "%s: %m", LO); exit(1); } diff --git a/libexec/getty/subr.c b/libexec/getty/subr.c index 08785c521c6..12b782c3c51 100644 --- a/libexec/getty/subr.c +++ b/libexec/getty/subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr.c,v 1.25 2015/12/22 08:54:16 mmcc Exp $ */ +/* $OpenBSD: subr.c,v 1.26 2016/03/16 15:41:10 krw Exp $ */ /* * Copyright (c) 1983, 1993 @@ -413,7 +413,7 @@ makeenv(char *env[]) if (*p) *ep++ = p; } - *ep = (char *)0; + *ep = NULL; } /* diff --git a/libexec/ld.so/dlfcn.c b/libexec/ld.so/dlfcn.c index 3da0e824f79..620e58517ef 100644 --- a/libexec/ld.so/dlfcn.c +++ b/libexec/ld.so/dlfcn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dlfcn.c,v 1.92 2015/12/22 08:54:16 mmcc Exp $ */ +/* $OpenBSD: dlfcn.c,v 1.93 2016/03/16 15:41:10 krw Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -599,7 +599,7 @@ dladdr(const void *addr, Dl_info *info) info->dli_fname = (char *)object->load_name; info->dli_fbase = (void *)object->load_base; info->dli_sname = NULL; - info->dli_saddr = (void *)0; + info->dli_saddr = NULL; /* * Walk the symbol list looking for the symbol whose address is 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 |