CVS commit: src/sys/kern

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Tue Oct  8 19:58:25 UTC 2013

Modified Files:
        src/sys/kern: uipc_socket2.c

Log Message:
0 -> NULL
MGET -> m_get
No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/sys/kern/uipc_socket2.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/kern/uipc_socket2.c
diff -u src/sys/kern/uipc_socket2.c:1.114 src/sys/kern/uipc_socket2.c:1.115
--- src/sys/kern/uipc_socket2.c:1.114	Sun Sep 15 11:41:11 2013
+++ src/sys/kern/uipc_socket2.c	Tue Oct  8 15:58:25 2013
@@ -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 @@ sbappend(struct sockbuf *sb, struct mbuf
 
 	KASSERT(solocked(sb->sb_so));
 
-	if (m == 0)
+	if (m == NULL)
 		return;
 
 #ifdef MBUFTRACE
@@ -819,7 +819,7 @@ sbappendrecord(struct sockbuf *sb, struc
 
 	KASSERT(solocked(sb->sb_so));
 
-	if (m0 == 0)
+	if (m0 == NULL)
 		return;
 
 #ifdef MBUFTRACE
@@ -854,7 +854,7 @@ sbinsertoob(struct sockbuf *sb, struct m
 
 	KASSERT(solocked(sb->sb_so));
 
-	if (m0 == 0)
+	if (m0 == NULL)
 		return;
 
 	SBLASTRECORDCHK(sb, "sbinsertoob 1");
@@ -921,13 +921,13 @@ sbappendaddr(struct sockbuf *sb, const s
 	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 @@ m_prepend_sockaddr(struct sockbuf *sb, s
 	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 @@ sbappendcontrol(struct sockbuf *sb, stru
 	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 @@ sbdrop(struct sockbuf *sb, int len)
 
 	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;