diff options
| author | pfg <pfg@FreeBSD.org> | 2016-04-10 19:33:58 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2016-04-10 19:33:58 +0000 |
| commit | 6e91d78151e10ed31c475cafe6a1e1f11950c1d9 (patch) | |
| tree | 6796a0cd32cea8fd5591b7f2c6d10ae7f153ccb9 /lib/libc/net | |
| parent | 1485828b0840fbefcb7789ae54df9650c16fda61 (diff) | |
| download | FreeBSD-src-6e91d78151e10ed31c475cafe6a1e1f11950c1d9.zip FreeBSD-src-6e91d78151e10ed31c475cafe6a1e1f11950c1d9.tar.gz | |
libc: replace 0 with NULL for pointers.
While here also cleanup some surrounding code; particularly
drop some malloc() casts.
Found with devel/coccinelle.
Reviewed by: bde (previous version - all new bugs are mine)
Diffstat (limited to 'lib/libc/net')
| -rw-r--r-- | lib/libc/net/base64.c | 2 | ||||
| -rw-r--r-- | lib/libc/net/getifaddrs.c | 3 | ||||
| -rw-r--r-- | lib/libc/net/getservent.c | 4 | ||||
| -rw-r--r-- | lib/libc/net/rcmd.c | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/lib/libc/net/base64.c b/lib/libc/net/base64.c index 8a9c59e..2c4cfe3 100644 --- a/lib/libc/net/base64.c +++ b/lib/libc/net/base64.c @@ -210,7 +210,7 @@ b64_pton(const char *src, u_char *target, size_t targsize) break; pos = strchr(Base64, ch); - if (pos == 0) /* A non-base64 character. */ + if (pos == NULL) /* A non-base64 character. */ return (-1); switch (state) { diff --git a/lib/libc/net/getifaddrs.c b/lib/libc/net/getifaddrs.c index f8633d5..4c04e9e 100644 --- a/lib/libc/net/getifaddrs.c +++ b/lib/libc/net/getifaddrs.c @@ -85,7 +85,7 @@ getifaddrs(struct ifaddrs **pif) size_t needed; char *buf; char *next; - struct ifaddrs *cif = 0; + struct ifaddrs *cif; char *p, *p0; struct rt_msghdr *rtm; struct if_msghdrl *ifm; @@ -214,6 +214,7 @@ getifaddrs(struct ifaddrs **pif) ift = ifa; idx = 0; + cif = NULL; for (next = buf; next < buf + needed; next += rtm->rtm_msglen) { rtm = (struct rt_msghdr *)(void *)next; if (rtm->rtm_version != RTM_VERSION) diff --git a/lib/libc/net/getservent.c b/lib/libc/net/getservent.c index 6a68ef5..45a5355 100644 --- a/lib/libc/net/getservent.c +++ b/lib/libc/net/getservent.c @@ -406,14 +406,14 @@ files_servent(void *retval, void *mdata, va_list ap) continue; gotname: - if (proto == 0 || strcmp(serv->s_proto, proto) == 0) + if (proto == NULL || strcmp(serv->s_proto, proto) == 0) rv = NS_SUCCESS; break; case nss_lt_id: if (port != serv->s_port) continue; - if (proto == 0 || strcmp(serv->s_proto, proto) == 0) + if (proto == NULL || strcmp(serv->s_proto, proto) == 0) rv = NS_SUCCESS; break; case nss_lt_all: diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c index c7ca870..7b92f08 100644 --- a/lib/libc/net/rcmd.c +++ b/lib/libc/net/rcmd.c @@ -207,7 +207,7 @@ rcmd_af(char **ahost, int rport, const char *locuser, const char *remuser, } } lport--; - if (fd2p == 0) { + if (fd2p == NULL) { _write(s, "", 1); lport = 0; } else { |
