[src/trunk]: src/sys/kern 0 -> NULL

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6792abb6af85
branches:  trunk
changeset: 790432:6792abb6af85
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Oct 08 19:58:25 2013 +0000

description:
0 -> NULL
MGET -> m_get
No functional change.

diffstat:

 sys/kern/uipc_socket2.c |  34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diffs (112 lines):

diff -r fc436744d679 -r 6792abb6af85 sys/kern/uipc_socket2.c
--- a/sys/kern/uipc_socket2.c   Tue Oct 08 18:05:31 2013 +0000
+++ b/sys/kern/uipc_socket2.c   Tue Oct 08 19:58:25 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_socket2.c,v 1.114 2013/09/15 15:41:11 martin Exp $        */
+/*     $NetBSD: uipc_socket2.c,v 1.115 2013/10/08 19:58:25 christos Exp $      */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.114 2013/09/15 15:41:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.115 2013/10/08 19:58:25 christos Exp $");
 
 #include "opt_mbuftrace.h"
 #include "opt_sb_max.h"
@@ -722,7 +722,7 @@
 
        KASSERT(solocked(sb->sb_so));
 
-       if (m == 0)
+       if (m == NULL)
                return;
 
 #ifdef MBUFTRACE
@@ -819,7 +819,7 @@
 
        KASSERT(solocked(sb->sb_so));
 
-       if (m0 == 0)
+       if (m0 == NULL)
                return;
 
 #ifdef MBUFTRACE
@@ -854,7 +854,7 @@
 
        KASSERT(solocked(sb->sb_so));
 
-       if (m0 == 0)
+       if (m0 == NULL)
                return;
 
        SBLASTRECORDCHK(sb, "sbinsertoob 1");
@@ -921,13 +921,13 @@
        for (n = control; n; n = n->m_next) {
                space += n->m_len;
                MCLAIM(n, sb->sb_mowner);
-               if (n->m_next == 0)     /* keep pointer to last control buf */
+               if (n->m_next == NULL)  /* keep pointer to last control buf */
                        break;
        }
        if (space > sbspace(sb))
                return (0);
-       MGET(m, M_DONTWAIT, MT_SONAME);
-       if (m == 0)
+       m = m_get(M_DONTWAIT, MT_SONAME);
+       if (m == NULL)
                return (0);
        MCLAIM(m, sb->sb_mowner);
        /*
@@ -979,16 +979,16 @@
        KASSERT(solocked(sb->sb_so));
 
        /* only the first in each chain need be a pkthdr */
-       MGETHDR(m, M_DONTWAIT, MT_SONAME);
-       if (m == 0)
-               return (0);
+       m = m_gethdr(M_DONTWAIT, MT_SONAME);
+       if (m == NULL)
+               return NULL;
        MCLAIM(m, sb->sb_mowner);
 #ifdef notyet
        if (salen > MHLEN) {
                MEXTMALLOC(m, salen, M_NOWAIT);
                if ((m->m_flags & M_EXT) == 0) {
                        m_free(m);
-                       return (0);
+                       return NULL;
                }
        }
 #else
@@ -1109,12 +1109,12 @@
        KASSERT(solocked(sb->sb_so));
 
        space = 0;
-       if (control == 0)
+       if (control == NULL)
                panic("sbappendcontrol");
        for (m = control; ; m = m->m_next) {
                space += m->m_len;
                MCLAIM(m, sb->sb_mowner);
-               if (m->m_next == 0)
+               if (m->m_next == NULL)
                        break;
        }
        n = m;                  /* save pointer to last control buffer */
@@ -1228,10 +1228,10 @@
 
        KASSERT(solocked(sb->sb_so));
 
-       next = (m = sb->sb_mb) ? m->m_nextpkt : 0;
+       next = (m = sb->sb_mb) ? m->m_nextpkt : NULL;
        while (len > 0) {
-               if (m == 0) {
-                       if (next == 0)
+               if (m == NULL) {
+                       if (next == NULL)
                                panic("sbdrop(%p,%d): cc=%lu",
                                    sb, len, sb->sb_cc);
                        m = next;