d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use NULL instead of 0 for pointers.

Browse Source 
Also malloc will return NULL if it cannot allocate memory.

MFC after:	2 weeks.
This commit is contained in:
araujo 2016-04-18 05:46:18 +00:00
parent 0bd7ac2f20
commit d2d25bb0ca
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/netstat/inet.c
View File

@ -120,7 +120,7 @@ pcblist_sysctl(int proto, const char *name, char **bufp, int istcp __unused)
xo_warn("sysctl: %s", mibvar); xo_warn("sysctl: %s", mibvar);
return (0); return (0);
} }
if ((buf = malloc(len)) == 0) { if ((buf = malloc(len)) == NULL) {
xo_warnx("malloc %lu bytes", (u_long)len); xo_warnx("malloc %lu bytes", (u_long)len);
return (0); return (0);
} }
@ -207,7 +207,7 @@ pcblist_kvm(u_long off, char **bufp, int istcp)
len = 2 * sizeof(xig) + len = 2 * sizeof(xig) +
(pcbinfo.ipi_count + pcbinfo.ipi_count / 8) * (pcbinfo.ipi_count + pcbinfo.ipi_count / 8) *
sizeof(struct xinpcb); sizeof(struct xinpcb);
if ((buf = malloc(len)) == 0) { if ((buf = malloc(len)) == NULL) {
xo_warnx("malloc %lu bytes", (u_long)len); xo_warnx("malloc %lu bytes", (u_long)len);
return (0); return (0);
} }
@ -1460,7 +1460,7 @@ inetname(struct in_addr *inp)
if (np) if (np)
cp = np->n_name; cp = np->n_name;
} }
if (cp == 0) { if (cp == NULL) {
hp = gethostbyaddr((char *)inp, sizeof (*inp), AF_INET); hp = gethostbyaddr((char *)inp, sizeof (*inp), AF_INET);
if (hp) { if (hp) {
cp = hp->h_name; cp = hp->h_name;

4
usr.bin/netstat/sctp.c
View File

@ -128,7 +128,7 @@ inetname(struct in_addr *inp)
if (np) if (np)
cp = np->n_name; cp = np->n_name;
} }
if (cp == 0) { if (cp == NULL) {
hp = gethostbyaddr((char *)inp, sizeof (*inp), AF_INET); hp = gethostbyaddr((char *)inp, sizeof (*inp), AF_INET);
if (hp) { if (hp) {
cp = hp->h_name; cp = hp->h_name;
@ -586,7 +586,7 @@ sctp_protopr(u_long off __unused,
xo_warn("sysctl: %s", mibvar); xo_warn("sysctl: %s", mibvar);
return; return;
} }
if ((buf = malloc(len)) == 0) { if ((buf = malloc(len)) == NULL) {
xo_warnx("malloc %lu bytes", (u_long)len); xo_warnx("malloc %lu bytes", (u_long)len);
return; return;
} }

4
usr.bin/netstat/unix.c
View File

@ -83,7 +83,7 @@ pcblist_sysctl(int type, char **bufp)
xo_warn("sysctl: %s", mibvar); xo_warn("sysctl: %s", mibvar);
return (-1); return (-1);
} }
if ((buf = malloc(len)) == 0) { if ((buf = malloc(len)) == NULL) {
xo_warnx("malloc %lu bytes", (u_long)len); xo_warnx("malloc %lu bytes", (u_long)len);
return (-2); return (-2);
} }
@ -116,7 +116,7 @@ pcblist_kvm(u_long count_off, u_long gencnt_off, u_long head_off, char **bufp)
return (-1); return (-1);
kread(count_off, &unp_count, sizeof(unp_count)); kread(count_off, &unp_count, sizeof(unp_count));
len = 2 * sizeof(xug) + (unp_count + unp_count / 8) * sizeof(xu); len = 2 * sizeof(xug) + (unp_count + unp_count / 8) * sizeof(xu);
if ((buf = malloc(len)) == 0) { if ((buf = malloc(len)) == NULL) {
xo_warnx("malloc %lu bytes", (u_long)len); xo_warnx("malloc %lu bytes", (u_long)len);
return (-2); return (-2);
} }