Module Name: src
Committed By: plunky
Date: Wed Aug 31 18:31:04 UTC 2011
Modified Files:
src/sys/coda: coda_subr.c
src/sys/compat/ndis: subr_ntoskrnl.c
src/sys/dev/pci: twa.c
src/sys/dev/raidframe: rf_aselect.c rf_cvscan.c rf_decluster.c
rf_reconmap.c
src/sys/fs/ntfs: ntfs_subr.c
src/sys/kern: kern_drvctl.c kern_malloc.c subr_autoconf.c uipc_mbuf.c
uipc_socket2.c
src/sys/miscfs/fifofs: fifo_vnops.c
src/sys/netatalk: ddp_input.c
src/sys/netinet: ip_input.c ip_mroute.c tcp_input.c tcp_timer.c
src/sys/netinet6: icmp6.c in6_pcb.c ip6_mroute.c mld6.c udp6_output.c
src/sys/netipsec: ipsec_output.c xform_esp.c
src/sys/netiso: tp_inet.c
src/sys/netsmb: smb_trantcp.c
Log Message:
NULL does not need a cast
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/coda/coda_subr.c
cvs rdiff -u -r1.20 -r1.21 src/sys/compat/ndis/subr_ntoskrnl.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/pci/twa.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/raidframe/rf_aselect.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/raidframe/rf_cvscan.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/raidframe/rf_decluster.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/raidframe/rf_reconmap.c
cvs rdiff -u -r1.45 -r1.46 src/sys/fs/ntfs/ntfs_subr.c
cvs rdiff -u -r1.31 -r1.32 src/sys/kern/kern_drvctl.c
cvs rdiff -u -r1.131 -r1.132 src/sys/kern/kern_malloc.c
cvs rdiff -u -r1.219 -r1.220 src/sys/kern/subr_autoconf.c
cvs rdiff -u -r1.142 -r1.143 src/sys/kern/uipc_mbuf.c
cvs rdiff -u -r1.108 -r1.109 src/sys/kern/uipc_socket2.c
cvs rdiff -u -r1.69 -r1.70 src/sys/miscfs/fifofs/fifo_vnops.c
cvs rdiff -u -r1.25 -r1.26 src/sys/netatalk/ddp_input.c
cvs rdiff -u -r1.295 -r1.296 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.119 -r1.120 src/sys/netinet/ip_mroute.c
cvs rdiff -u -r1.315 -r1.316 src/sys/netinet/tcp_input.c
cvs rdiff -u -r1.85 -r1.86 src/sys/netinet/tcp_timer.c
cvs rdiff -u -r1.156 -r1.157 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.114 -r1.115 src/sys/netinet6/in6_pcb.c
cvs rdiff -u -r1.100 -r1.101 src/sys/netinet6/ip6_mroute.c
cvs rdiff -u -r1.52 -r1.53 src/sys/netinet6/mld6.c
cvs rdiff -u -r1.41 -r1.42 src/sys/netinet6/udp6_output.c
cvs rdiff -u -r1.36 -r1.37 src/sys/netipsec/ipsec_output.c
cvs rdiff -u -r1.38 -r1.39 src/sys/netipsec/xform_esp.c
cvs rdiff -u -r1.40 -r1.41 src/sys/netiso/tp_inet.c
cvs rdiff -u -r1.43 -r1.44 src/sys/netsmb/smb_trantcp.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/coda/coda_subr.c
diff -u src/sys/coda/coda_subr.c:1.24 src/sys/coda/coda_subr.c:1.25
--- src/sys/coda/coda_subr.c:1.24 Wed Oct 10 20:42:21 2007
+++ src/sys/coda/coda_subr.c Wed Aug 31 18:31:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_subr.c,v 1.24 2007/10/10 20:42:21 ad Exp $ */
+/* $NetBSD: coda_subr.c,v 1.25 2011/08/31 18:31:02 plunky Exp $ */
/*
*
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_subr.c,v 1.24 2007/10/10 20:42:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_subr.c,v 1.25 2011/08/31 18:31:02 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -157,7 +157,7 @@
} else {
CNODE_NEXT(ptrprev) = CNODE_NEXT(ptr);
}
- CNODE_NEXT(cp) = (struct cnode *)NULL;
+ CNODE_NEXT(cp) = NULL;
return;
}
Index: src/sys/compat/ndis/subr_ntoskrnl.c
diff -u src/sys/compat/ndis/subr_ntoskrnl.c:1.20 src/sys/compat/ndis/subr_ntoskrnl.c:1.21
--- src/sys/compat/ndis/subr_ntoskrnl.c:1.20 Sun Jul 17 20:54:50 2011
+++ src/sys/compat/ndis/subr_ntoskrnl.c Wed Aug 31 18:31:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_ntoskrnl.c,v 1.20 2011/07/17 20:54:50 joerg Exp $ */
+/* $NetBSD: subr_ntoskrnl.c,v 1.21 2011/08/31 18:31:02 plunky Exp $ */
/*-
* Copyright (c) 2003
@@ -37,7 +37,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.43.2.5 2005/03/31 04:24:36 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_ntoskrnl.c,v 1.20 2011/07/17 20:54:50 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_ntoskrnl.c,v 1.21 2011/08/31 18:31:02 plunky Exp $");
#endif
#ifdef __FreeBSD__
@@ -2108,7 +2108,7 @@
atoi(const char *str)
{
#ifdef __FreeBSD__
- return (int)strtol(str, (char **)NULL, 10);
+ return (int)strtol(str, NULL, 10);
#else
int n;
@@ -2123,7 +2123,7 @@
atol(const char *str)
{
#ifdef __FreeBSD__
- return strtol(str, (char **)NULL, 10);
+ return strtol(str, NULL, 10);
#else
long n;
Index: src/sys/dev/pci/twa.c
diff -u src/sys/dev/pci/twa.c:1.37 src/sys/dev/pci/twa.c:1.38
--- src/sys/dev/pci/twa.c:1.37 Tue May 24 18:28:01 2011
+++ src/sys/dev/pci/twa.c Wed Aug 31 18:31:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: twa.c,v 1.37 2011/05/24 18:28:01 joerg Exp $ */
+/* $NetBSD: twa.c,v 1.38 2011/08/31 18:31:02 plunky Exp $ */
/* $wasabi: twa.c,v 1.27 2006/07/28 18:17:21 wrstuden Exp $ */
/*-
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.37 2011/05/24 18:28:01 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.38 2011/08/31 18:31:02 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -250,7 +250,7 @@
{0x00FD, "Handler lockup"},
{0x00FE, "Retrying PCI transfer"},
{0x00FF, "AEN queue is full"},
- {0xFFFFFFFF, (char *)NULL}
+ {0xFFFFFFFF, NULL}
};
/* AEN severity table. */
@@ -260,7 +260,7 @@
"WARNING",
"INFO",
"DEBUG",
- (char *)NULL
+ NULL
};
/* Error messages. */
@@ -377,7 +377,7 @@
{0x025B, "Invalid LBA offset specified in CreateUnit descriptor"},
{0x025C, "Invalid stripelet size specified in CreateUnit descriptor"},
{0x0260, "SMART attribute exceeded threshold"},
- {0xFFFFFFFF, (char *)NULL}
+ {0xFFFFFFFF, NULL}
};
struct twa_pci_identity {
Index: src/sys/dev/raidframe/rf_aselect.c
diff -u src/sys/dev/raidframe/rf_aselect.c:1.26 src/sys/dev/raidframe/rf_aselect.c:1.27
--- src/sys/dev/raidframe/rf_aselect.c:1.26 Sat Feb 7 20:41:30 2009
+++ src/sys/dev/raidframe/rf_aselect.c Wed Aug 31 18:31:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_aselect.c,v 1.26 2009/02/07 20:41:30 oster Exp $ */
+/* $NetBSD: rf_aselect.c,v 1.27 2011/08/31 18:31:02 plunky Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_aselect.c,v 1.26 2009/02/07 20:41:30 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_aselect.c,v 1.27 2011/08/31 18:31:02 plunky Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -222,7 +222,7 @@
/* check to see if we found a creation func
* for this stripe unit */
- if (vfple->fn == (RF_VoidFuncPtr) NULL) {
+ if (vfple->fn == NULL) {
/* could not find creation function
* for stripe unit so, let's see if we
* can find one for each block in the
@@ -375,7 +375,7 @@
tmpvfple = failed_stripe->bvfple;
for (j = 0, physPtr = asm_p->physInfo; physPtr; physPtr = physPtr->next, j++) {
uFunc = vfple->fn; /* stripeUnitFuncs[stripeNum][j]; */
- if (uFunc == (RF_VoidFuncPtr) NULL) {
+ if (uFunc == NULL) {
/* use bailout functions for
* this stripe unit */
for (k = 0; k < physPtr->numSector; k++) {
Index: src/sys/dev/raidframe/rf_cvscan.c
diff -u src/sys/dev/raidframe/rf_cvscan.c:1.15 src/sys/dev/raidframe/rf_cvscan.c:1.16
--- src/sys/dev/raidframe/rf_cvscan.c:1.15 Thu Nov 16 01:33:23 2006
+++ src/sys/dev/raidframe/rf_cvscan.c Wed Aug 31 18:31:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_cvscan.c,v 1.15 2006/11/16 01:33:23 christos Exp $ */
+/* $NetBSD: rf_cvscan.c,v 1.16 2011/08/31 18:31:02 plunky Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -35,7 +35,7 @@
******************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_cvscan.c,v 1.15 2006/11/16 01:33:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_cvscan.c,v 1.16 2011/08/31 18:31:02 plunky Exp $");
#include <dev/raidframe/raidframevar.h>
#include "rf_alloclist.h"
@@ -56,17 +56,17 @@
long i, key;
RF_DiskQueueData_t *tmp;
- if (hdr->left != (RF_DiskQueueData_t *) NULL)
+ if (hdr->left != NULL)
RF_ASSERT(hdr->left->sectorOffset < hdr->cur_block);
for (key = hdr->cur_block, i = 0, tmp = hdr->left;
- tmp != (RF_DiskQueueData_t *) NULL;
+ tmp != NULL;
key = tmp->sectorOffset, i++, tmp = tmp->next)
RF_ASSERT(tmp->sectorOffset <= key
&& tmp->priority == hdr->nxt_priority && pri_ok(tmp->priority));
RF_ASSERT(i == hdr->left_cnt);
for (key = hdr->cur_block, i = 0, tmp = hdr->right;
- tmp != (RF_DiskQueueData_t *) NULL;
+ tmp != NULL;
key = tmp->sectorOffset, i++, tmp = tmp->next) {
RF_ASSERT(key <= tmp->sectorOffset);
RF_ASSERT(tmp->priority == hdr->nxt_priority);
@@ -75,7 +75,7 @@
RF_ASSERT(i == hdr->right_cnt);
for (key = hdr->nxt_priority - 1, tmp = hdr->burner;
- tmp != (RF_DiskQueueData_t *) NULL;
+ tmp != NULL;
key = tmp->priority, tmp = tmp->next) {
RF_ASSERT(tmp);
RF_ASSERT(hdr);
@@ -94,8 +94,7 @@
* pointed to by the pointer that list_ptr points to * ie., list_ptr
* is a grandparent of the first entry */
- for (; (*list_ptr) != (RF_DiskQueueData_t *) NULL &&
- (*list_ptr)->priority > req->priority;
+ for (; (*list_ptr) != NULL && (*list_ptr)->priority > req->priority;
list_ptr = &((*list_ptr)->next)) {
}
req->next = (*list_ptr);
@@ -111,8 +110,7 @@
* pointed to by the pointer that list_ptr points to * ie., list_ptr
* is a grandparent of the first entry */
- for (; (*list_ptr) != (RF_DiskQueueData_t *) NULL &&
-
+ for (; (*list_ptr) != NULL &&
((order == rf_cvscan_RIGHT && (*list_ptr)->sectorOffset <= req->sectorOffset)
|| (order == rf_cvscan_LEFT && (*list_ptr)->sectorOffset > req->sectorOffset));
list_ptr = &((*list_ptr)->next)) {
@@ -127,7 +125,7 @@
ReqDequeue(RF_DiskQueueData_t **list_ptr)
{
RF_DiskQueueData_t *ret = (*list_ptr);
- if ((*list_ptr) != (RF_DiskQueueData_t *) NULL) {
+ if ((*list_ptr) != NULL) {
(*list_ptr) = (*list_ptr)->next;
}
return (ret);
@@ -139,7 +137,7 @@
ReBalance(RF_CvscanHeader_t *hdr)
{
/* DO_CHECK_STATE(hdr); */
- while (hdr->right != (RF_DiskQueueData_t *) NULL
+ while (hdr->right != NULL
&& hdr->right->sectorOffset < hdr->cur_block) {
hdr->right_cnt--;
hdr->left_cnt++;
@@ -154,12 +152,12 @@
Transfer(RF_DiskQueueData_t **to_list_ptr, RF_DiskQueueData_t **from_list_ptr)
{
RF_DiskQueueData_t *gp;
- for (gp = (*from_list_ptr); gp != (RF_DiskQueueData_t *) NULL;) {
+ for (gp = (*from_list_ptr); gp != NULL;) {
RF_DiskQueueData_t *p = gp->next;
PriorityInsert(to_list_ptr, gp);
gp = p;
}
- (*from_list_ptr) = (RF_DiskQueueData_t *) NULL;
+ (*from_list_ptr) = NULL;
}
@@ -224,18 +222,18 @@
DO_CHECK_STATE(hdr);
if (hdr->left_cnt == 0 && hdr->right_cnt == 0)
- return ((RF_DiskQueueData_t *) NULL);
+ return (NULL);
range = RF_MIN(hdr->range_for_avg, RF_MIN(hdr->left_cnt, hdr->right_cnt));
for (i = 0, tmp = hdr->left, sum_dist_left =
((hdr->direction == rf_cvscan_RIGHT) ? range * hdr->change_penalty : 0);
- tmp != (RF_DiskQueueData_t *) NULL && i < range;
+ tmp != NULL && i < range;
tmp = tmp->next, i++) {
sum_dist_left += hdr->cur_block - tmp->sectorOffset;
}
for (i = 0, tmp = hdr->right, sum_dist_right =
((hdr->direction == rf_cvscan_LEFT) ? range * hdr->change_penalty : 0);
- tmp != (RF_DiskQueueData_t *) NULL && i < range;
+ tmp != NULL && i < range;
tmp = tmp->next, i++) {
sum_dist_right += tmp->sectorOffset - hdr->cur_block;
}
@@ -256,13 +254,13 @@
ReBalance(hdr);
if (hdr->left_cnt == 0 && hdr->right_cnt == 0
- && hdr->burner != (RF_DiskQueueData_t *) NULL) {
+ && hdr->burner != NULL) {
/*
** restore low priority requests for next dequeue
*/
RF_DiskQueueData_t *burner = hdr->burner;
hdr->nxt_priority = burner->priority;
- while (burner != (RF_DiskQueueData_t *) NULL
+ while (burner != NULL
&& burner->priority == hdr->nxt_priority) {
RF_DiskQueueData_t *next = burner->next;
RealEnqueue(hdr, burner);
@@ -291,13 +289,13 @@
range = RF_MIN(hdr->range_for_avg, RF_MIN(hdr->left_cnt, hdr->right_cnt));
for (i = 0, tmp = hdr->left, sum_dist_left =
((hdr->direction == rf_cvscan_RIGHT) ? range * hdr->change_penalty : 0);
- tmp != (RF_DiskQueueData_t *) NULL && i < range;
+ tmp != NULL && i < range;
tmp = tmp->next, i++) {
sum_dist_left += hdr->cur_block - tmp->sectorOffset;
}
for (i = 0, tmp = hdr->right, sum_dist_right =
((hdr->direction == rf_cvscan_LEFT) ? range * hdr->change_penalty : 0);
- tmp != (RF_DiskQueueData_t *) NULL && i < range;
+ tmp != NULL && i < range;
tmp = tmp->next, i++) {
sum_dist_right += tmp->sectorOffset - hdr->cur_block;
}
@@ -335,8 +333,8 @@
hdr->direction = rf_cvscan_RIGHT;
hdr->cur_block = 0;
hdr->left_cnt = hdr->right_cnt = 0;
- hdr->left = hdr->right = (RF_DiskQueueData_t *) NULL;
- hdr->burner = (RF_DiskQueueData_t *) NULL;
+ hdr->left = hdr->right = NULL;
+ hdr->burner = NULL;
DO_CHECK_STATE(hdr);
return ((void *) hdr);
@@ -357,21 +355,21 @@
(int) hdr->cur_block,
(hdr->direction == rf_cvscan_LEFT) ? "LEFT" : "RIGHT");
printf("\tLeft(%d): ", hdr->left_cnt);
- for (tmp = hdr->left; tmp != (RF_DiskQueueData_t *) NULL; tmp = tmp->next)
+ for (tmp = hdr->left; tmp != NULL; tmp = tmp->next)
printf("(%d,%ld,%d) ",
(int) tmp->sectorOffset,
(long) (tmp->sectorOffset + tmp->numSector),
tmp->priority);
printf("\n");
printf("\tRight(%d): ", hdr->right_cnt);
- for (tmp = hdr->right; tmp != (RF_DiskQueueData_t *) NULL; tmp = tmp->next)
+ for (tmp = hdr->right; tmp != NULL; tmp = tmp->next)
printf("(%d,%ld,%d) ",
(int) tmp->sectorOffset,
(long) (tmp->sectorOffset + tmp->numSector),
tmp->priority);
printf("\n");
printf("\tBurner: ");
- for (tmp = hdr->burner; tmp != (RF_DiskQueueData_t *) NULL; tmp = tmp->next)
+ for (tmp = hdr->burner; tmp != NULL; tmp = tmp->next)
printf("(%d,%ld,%d) ",
(int) tmp->sectorOffset,
(long) (tmp->sectorOffset + tmp->numSector),
Index: src/sys/dev/raidframe/rf_decluster.c
diff -u src/sys/dev/raidframe/rf_decluster.c:1.22 src/sys/dev/raidframe/rf_decluster.c:1.23
--- src/sys/dev/raidframe/rf_decluster.c:1.22 Sun Mar 4 06:02:36 2007
+++ src/sys/dev/raidframe/rf_decluster.c Wed Aug 31 18:31:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_decluster.c,v 1.22 2007/03/04 06:02:36 christos Exp $ */
+/* $NetBSD: rf_decluster.c,v 1.23 2011/08/31 18:31:02 plunky Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -48,7 +48,7 @@
*--------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_decluster.c,v 1.22 2007/03/04 06:02:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_decluster.c,v 1.23 2011/08/31 18:31:02 plunky Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -696,5 +696,5 @@
RF_Free(table[i], info->BlocksPerTable * sizeof(RF_SpareTableEntry_t));
}
RF_Free(table, info->TablesPerSpareRegion * sizeof(RF_SpareTableEntry_t *));
- info->SpareTable = (RF_SpareTableEntry_t **) NULL;
+ info->SpareTable = NULL;
}
Index: src/sys/dev/raidframe/rf_reconmap.c
diff -u src/sys/dev/raidframe/rf_reconmap.c:1.32 src/sys/dev/raidframe/rf_reconmap.c:1.33
--- src/sys/dev/raidframe/rf_reconmap.c:1.32 Tue May 10 07:04:17 2011
+++ src/sys/dev/raidframe/rf_reconmap.c Wed Aug 31 18:31:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconmap.c,v 1.32 2011/05/10 07:04:17 mrg Exp $ */
+/* $NetBSD: rf_reconmap.c,v 1.33 2011/08/31 18:31:02 plunky Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
*************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_reconmap.c,v 1.32 2011/05/10 07:04:17 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconmap.c,v 1.33 2011/08/31 18:31:02 plunky Exp $");
#include "rf_raid.h"
#include <sys/time.h>
@@ -100,7 +100,7 @@
p->head = 0;
RF_Malloc(p->status, p->status_size * sizeof(RF_ReconMapListElem_t *), (RF_ReconMapListElem_t **));
- RF_ASSERT(p->status != (RF_ReconMapListElem_t **) NULL);
+ RF_ASSERT(p->status != NULL);
(void) memset((char *) p->status, 0,
p->status_size * sizeof(RF_ReconMapListElem_t *));
Index: src/sys/fs/ntfs/ntfs_subr.c
diff -u src/sys/fs/ntfs/ntfs_subr.c:1.45 src/sys/fs/ntfs/ntfs_subr.c:1.46
--- src/sys/fs/ntfs/ntfs_subr.c:1.45 Thu Jun 30 20:09:41 2011
+++ src/sys/fs/ntfs/ntfs_subr.c Wed Aug 31 18:31:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ntfs_subr.c,v 1.45 2011/06/30 20:09:41 wiz Exp $ */
+/* $NetBSD: ntfs_subr.c,v 1.46 2011/08/31 18:31:02 plunky Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko ([email protected])
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ntfs_subr.c,v 1.45 2011/06/30 20:09:41 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ntfs_subr.c,v 1.46 2011/08/31 18:31:02 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2015,7 +2015,7 @@
void
ntfs_toupper_init(void)
{
- ntfs_toupper_tab = (wchar *) NULL;
+ ntfs_toupper_tab = NULL;
mutex_init(&ntfs_toupper_lock, MUTEX_DEFAULT, IPL_NONE);
ntfs_toupper_usecount = 0;
}
Index: src/sys/kern/kern_drvctl.c
diff -u src/sys/kern/kern_drvctl.c:1.31 src/sys/kern/kern_drvctl.c:1.32
--- src/sys/kern/kern_drvctl.c:1.31 Sun Dec 20 09:36:05 2009
+++ src/sys/kern/kern_drvctl.c Wed Aug 31 18:31:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_drvctl.c,v 1.31 2009/12/20 09:36:05 dsl Exp $ */
+/* $NetBSD: kern_drvctl.c,v 1.32 2011/08/31 18:31:02 plunky Exp $ */
/*
* Copyright (c) 2004
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.31 2009/12/20 09:36:05 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_drvctl.c,v 1.32 2011/08/31 18:31:02 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -202,7 +202,7 @@
int cnt = 0, idx, error = 0;
if (*l->l_devname == '\0')
- d = (device_t)NULL;
+ d = NULL;
else if (memchr(l->l_devname, 0, sizeof(l->l_devname)) == NULL)
return EINVAL;
else if ((d = device_find_by_xname(l->l_devname)) == NULL)
Index: src/sys/kern/kern_malloc.c
diff -u src/sys/kern/kern_malloc.c:1.131 src/sys/kern/kern_malloc.c:1.132
--- src/sys/kern/kern_malloc.c:1.131 Wed May 5 02:20:42 2010
+++ src/sys/kern/kern_malloc.c Wed Aug 31 18:31:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_malloc.c,v 1.131 2010/05/05 02:20:42 christos Exp $ */
+/* $NetBSD: kern_malloc.c,v 1.132 2011/08/31 18:31:02 plunky Exp $ */
/*
* Copyright (c) 1987, 1991, 1993
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.131 2010/05/05 02:20:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.132 2011/08/31 18:31:02 plunky Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -363,7 +363,7 @@
while (ksp->ks_memuse >= ksp->ks_limit) {
if (flags & M_NOWAIT) {
mutex_spin_exit(&malloc_lock);
- return ((void *) NULL);
+ return (NULL);
}
if (ksp->ks_limblocks < 65535)
ksp->ks_limblocks++;
Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.219 src/sys/kern/subr_autoconf.c:1.220
--- src/sys/kern/subr_autoconf.c:1.219 Sat Aug 27 19:52:22 2011
+++ src/sys/kern/subr_autoconf.c Wed Aug 31 18:31:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.219 2011/08/27 19:52:22 martin Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.220 2011/08/31 18:31:02 plunky Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.219 2011/08/27 19:52:22 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.220 2011/08/31 18:31:02 plunky Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -1074,8 +1074,8 @@
{
cfdata_t cf;
- if ((cf = config_rootsearch((cfsubmatch_t)NULL, rootname, aux)) != NULL)
- return config_attach(ROOT, cf, aux, (cfprint_t)NULL);
+ if ((cf = config_rootsearch(NULL, rootname, aux)) != NULL)
+ return config_attach(ROOT, cf, aux, NULL);
aprint_error("root device %s not configured\n", rootname);
return NULL;
}
Index: src/sys/kern/uipc_mbuf.c
diff -u src/sys/kern/uipc_mbuf.c:1.142 src/sys/kern/uipc_mbuf.c:1.143
--- src/sys/kern/uipc_mbuf.c:1.142 Mon Aug 8 19:10:33 2011
+++ src/sys/kern/uipc_mbuf.c Wed Aug 31 18:31:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_mbuf.c,v 1.142 2011/08/08 19:10:33 dyoung Exp $ */
+/* $NetBSD: uipc_mbuf.c,v 1.143 2011/08/31 18:31:02 plunky Exp $ */
/*-
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.142 2011/08/08 19:10:33 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.143 2011/08/31 18:31:02 plunky Exp $");
#include "opt_mbuftrace.h"
#include "opt_nmbclusters.h"
@@ -601,9 +601,9 @@
struct mbuf *mn;
MGET(mn, how, m->m_type);
- if (mn == (struct mbuf *)NULL) {
+ if (mn == NULL) {
m_freem(m);
- return ((struct mbuf *)NULL);
+ return (NULL);
}
if (m->m_flags & M_PKTHDR) {
M_MOVE_PKTHDR(mn, m);
Index: src/sys/kern/uipc_socket2.c
diff -u src/sys/kern/uipc_socket2.c:1.108 src/sys/kern/uipc_socket2.c:1.109
--- src/sys/kern/uipc_socket2.c:1.108 Sun Apr 24 18:46:23 2011
+++ src/sys/kern/uipc_socket2.c Wed Aug 31 18:31:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket2.c,v 1.108 2011/04/24 18:46:23 rmind Exp $ */
+/* $NetBSD: uipc_socket2.c,v 1.109 2011/08/31 18:31:03 plunky 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.108 2011/04/24 18:46:23 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.109 2011/08/31 18:31:03 plunky Exp $");
#include "opt_mbuftrace.h"
#include "opt_sb_max.h"
@@ -1313,7 +1313,7 @@
}
if ((m = m_get(M_DONTWAIT, MT_CONTROL)) == NULL)
- return ((struct mbuf *) NULL);
+ return (NULL);
if (CMSG_SPACE(size) > MLEN) {
MCLGET(m, M_DONTWAIT);
if ((m->m_flags & M_EXT) == 0) {
Index: src/sys/miscfs/fifofs/fifo_vnops.c
diff -u src/sys/miscfs/fifofs/fifo_vnops.c:1.69 src/sys/miscfs/fifofs/fifo_vnops.c:1.70
--- src/sys/miscfs/fifofs/fifo_vnops.c:1.69 Thu Jun 24 13:03:16 2010
+++ src/sys/miscfs/fifofs/fifo_vnops.c Wed Aug 31 18:31:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fifo_vnops.c,v 1.69 2010/06/24 13:03:16 hannken Exp $ */
+/* $NetBSD: fifo_vnops.c,v 1.70 2011/08/31 18:31:03 plunky Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.69 2010/06/24 13:03:16 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.70 2011/08/31 18:31:03 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -675,7 +675,7 @@
{ &vop_advlock_desc, genfs_einval }, /* advlock */
{ &vop_bwrite_desc, genfs_nullop }, /* bwrite */
{ &vop_putpages_desc, genfs_null_putpages }, /* putpages */
- { (struct vnodeop_desc*)NULL, (int(*)(void *))NULL }
+ { NULL, NULL }
};
const struct vnodeopv_desc fifo_vnodeop_opv_desc =
{ &fifo_vnodeop_p, fifo_vnodeop_entries };
Index: src/sys/netatalk/ddp_input.c
diff -u src/sys/netatalk/ddp_input.c:1.25 src/sys/netatalk/ddp_input.c:1.26
--- src/sys/netatalk/ddp_input.c:1.25 Sat Apr 18 14:58:05 2009
+++ src/sys/netatalk/ddp_input.c Wed Aug 31 18:31:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ddp_input.c,v 1.25 2009/04/18 14:58:05 tsutsui Exp $ */
+/* $NetBSD: ddp_input.c,v 1.26 2011/08/31 18:31:03 plunky Exp $ */
/*
* Copyright (c) 1990,1994 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ddp_input.c,v 1.25 2009/04/18 14:58:05 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ddp_input.c,v 1.26 2011/08/31 18:31:03 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,7 +88,7 @@
m_freem(m);
continue;
}
- ddp_input(m, ifp, (struct elaphdr *) NULL, 2);
+ ddp_input(m, ifp, NULL, 2);
}
for (;;) {
@@ -122,7 +122,7 @@
m_adj(m, SZ_ELAPHDR);
if (elhp->el_type == ELAP_DDPEXTEND) {
- ddp_input(m, ifp, (struct elaphdr *) NULL, 1);
+ ddp_input(m, ifp, NULL, 1);
} else {
memcpy((void *) & elh, (void *) elhp, SZ_ELAPHDR);
ddp_input(m, ifp, &elh, 1);
Index: src/sys/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.295 src/sys/netinet/ip_input.c:1.296
--- src/sys/netinet/ip_input.c:1.295 Tue May 3 17:44:31 2011
+++ src/sys/netinet/ip_input.c Wed Aug 31 18:31:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_input.c,v 1.295 2011/05/03 17:44:31 dyoung Exp $ */
+/* $NetBSD: ip_input.c,v 1.296 2011/08/31 18:31:03 plunky Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.295 2011/05/03 17:44:31 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.296 2011/08/31 18:31:03 plunky Exp $");
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
@@ -1405,7 +1405,7 @@
error = ip_output(m, NULL, &ipforward_rt,
(IP_FORWARDING | (ip_directedbcast ? IP_ALLOWBROADCAST : 0)),
- (struct ip_moptions *)NULL, (struct socket *)NULL);
+ NULL, NULL);
if (error)
IP_STATINC(IP_STAT_CANTFORWARD);
Index: src/sys/netinet/ip_mroute.c
diff -u src/sys/netinet/ip_mroute.c:1.119 src/sys/netinet/ip_mroute.c:1.120
--- src/sys/netinet/ip_mroute.c:1.119 Sun Jul 17 20:54:53 2011
+++ src/sys/netinet/ip_mroute.c Wed Aug 31 18:31:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_mroute.c,v 1.119 2011/07/17 20:54:53 joerg Exp $ */
+/* $NetBSD: ip_mroute.c,v 1.120 2011/08/31 18:31:03 plunky Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -93,7 +93,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.119 2011/07/17 20:54:53 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.120 2011/08/31 18:31:03 plunky Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -1275,8 +1275,7 @@
socket_send(struct socket *s, struct mbuf *mm, struct sockaddr_in *src)
{
if (s) {
- if (sbappendaddr(&s->so_rcv, sintosa(src), mm,
- (struct mbuf *)NULL) != 0) {
+ if (sbappendaddr(&s->so_rcv, sintosa(src), mm, NULL) != 0) {
sorwakeup(s);
return (0);
}
@@ -1353,7 +1352,7 @@
(vifp->v_flags & VIFF_TUNNEL) ? "tunnel on " : "",
vifp->v_ifp->if_xname);
}
- return (ip_mdq(m, ifp, (struct mfc *)NULL, vifi));
+ return (ip_mdq(m, ifp, NULL, vifi));
}
if (rsvpdebug && ip->ip_p == IPPROTO_RSVP) {
printf("Warning: IPPROTO_RSVP from %x to %x without vif option\n",
@@ -2127,9 +2126,7 @@
if (vifp->v_flags & VIFF_TUNNEL) {
/* If tunnel options */
- ip_output(m, (struct mbuf *)NULL, &vifp->v_route,
- IP_FORWARDING, (struct ip_moptions *)NULL,
- (struct socket *)NULL);
+ ip_output(m, NULL, &vifp->v_route, IP_FORWARDING, NULL, NULL);
} else {
/* if physical interface option, extract the options and then send */
struct ip_moptions imo;
@@ -3475,7 +3472,7 @@
reg_vif_num);
}
/* NB: vifp was collected above; can it change on us? */
- looutput(vifp, m, (struct sockaddr *)&dst, (struct rtentry *)NULL);
+ looutput(vifp, m, (struct sockaddr *)&dst, NULL);
/* prepare the register head to send to the mrouting daemon */
m = mcp;
Index: src/sys/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.315 src/sys/netinet/tcp_input.c:1.316
--- src/sys/netinet/tcp_input.c:1.315 Sun Jul 17 20:54:53 2011
+++ src/sys/netinet/tcp_input.c Wed Aug 31 18:31:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_input.c,v 1.315 2011/07/17 20:54:53 joerg Exp $ */
+/* $NetBSD: tcp_input.c,v 1.316 2011/08/31 18:31:03 plunky Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.315 2011/07/17 20:54:53 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.316 2011/08/31 18:31:03 plunky Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -4818,7 +4818,7 @@
case AF_INET:
error = ip_output(m, sc->sc_ipopts, ro,
(ip_mtudisc ? IP_MTUDISC : 0),
- (struct ip_moptions *)NULL, so);
+ NULL, so);
break;
#endif
#ifdef INET6
Index: src/sys/netinet/tcp_timer.c
diff -u src/sys/netinet/tcp_timer.c:1.85 src/sys/netinet/tcp_timer.c:1.86
--- src/sys/netinet/tcp_timer.c:1.85 Wed Apr 20 13:35:52 2011
+++ src/sys/netinet/tcp_timer.c Wed Aug 31 18:31:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_timer.c,v 1.85 2011/04/20 13:35:52 gdt Exp $ */
+/* $NetBSD: tcp_timer.c,v 1.86 2011/08/31 18:31:03 plunky Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -93,7 +93,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_timer.c,v 1.85 2011/04/20 13:35:52 gdt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_timer.c,v 1.86 2011/08/31 18:31:03 plunky Exp $");
#include "opt_inet.h"
#include "opt_tcp_debug.h"
@@ -568,11 +568,11 @@
* length to get a 4.2 host to respond.
*/
(void)tcp_respond(tp, tp->t_template,
- (struct mbuf *)NULL, NULL, tp->rcv_nxt - 1,
+ NULL, NULL, tp->rcv_nxt - 1,
tp->snd_una - 1, 0);
} else {
(void)tcp_respond(tp, tp->t_template,
- (struct mbuf *)NULL, NULL, tp->rcv_nxt,
+ NULL, NULL, tp->rcv_nxt,
tp->snd_una - 1, 0);
}
TCP_TIMER_ARM(tp, TCPT_KEEP, tp->t_keepintvl);
Index: src/sys/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.156 src/sys/netinet6/icmp6.c:1.157
--- src/sys/netinet6/icmp6.c:1.156 Sun Sep 12 16:04:57 2010
+++ src/sys/netinet6/icmp6.c Wed Aug 31 18:31:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.156 2010/09/12 16:04:57 drochner Exp $ */
+/* $NetBSD: icmp6.c,v 1.157 2011/08/31 18:31:03 plunky Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.156 2010/09/12 16:04:57 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.157 2011/08/31 18:31:03 plunky Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -2306,7 +2306,7 @@
bcopy(&reddst6, &sdst.sin6_addr, sizeof(struct in6_addr));
bcopy(&src6, &ssrc.sin6_addr, sizeof(struct in6_addr));
rtredirect((struct sockaddr *)&sdst, (struct sockaddr *)&sgw,
- (struct sockaddr *)NULL, RTF_GATEWAY | RTF_HOST,
+ NULL, RTF_GATEWAY | RTF_HOST,
(struct sockaddr *)&ssrc,
&newrt);
@@ -2574,8 +2574,7 @@
= in6_cksum(m, IPPROTO_ICMPV6, sizeof(*ip6), ntohs(ip6->ip6_plen));
/* send the packet to outside... */
- if (ip6_output(m, NULL, NULL, 0,
- (struct ip6_moptions *)NULL, (struct socket *)NULL, NULL) != 0)
+ if (ip6_output(m, NULL, NULL, 0, NULL, NULL, NULL) != 0)
icmp6_ifstat_inc(ifp, ifs6_out_error);
icmp6_ifstat_inc(ifp, ifs6_out_msg);
Index: src/sys/netinet6/in6_pcb.c
diff -u src/sys/netinet6/in6_pcb.c:1.114 src/sys/netinet6/in6_pcb.c:1.115
--- src/sys/netinet6/in6_pcb.c:1.114 Wed May 4 01:45:48 2011
+++ src/sys/netinet6/in6_pcb.c Wed Aug 31 18:31:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_pcb.c,v 1.114 2011/05/04 01:45:48 dyoung Exp $ */
+/* $NetBSD: in6_pcb.c,v 1.115 2011/08/31 18:31:03 plunky Exp $ */
/* $KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.114 2011/05/04 01:45:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.115 2011/08/31 18:31:03 plunky Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -369,7 +369,7 @@
{
struct in6pcb *in6p = v;
struct sockaddr_in6 lsin6;
- struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)NULL;
+ struct sockaddr_in6 *sin6 = NULL;
int error;
if (in6p->in6p_af != AF_INET6)
Index: src/sys/netinet6/ip6_mroute.c
diff -u src/sys/netinet6/ip6_mroute.c:1.100 src/sys/netinet6/ip6_mroute.c:1.101
--- src/sys/netinet6/ip6_mroute.c:1.100 Thu Oct 14 03:34:42 2010
+++ src/sys/netinet6/ip6_mroute.c Wed Aug 31 18:31:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_mroute.c,v 1.100 2010/10/14 03:34:42 oki Exp $ */
+/* $NetBSD: ip6_mroute.c,v 1.101 2011/08/31 18:31:03 plunky Exp $ */
/* $KAME: ip6_mroute.c,v 1.49 2001/07/25 09:21:18 jinmei Exp $ */
/*
@@ -117,7 +117,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.100 2010/10/14 03:34:42 oki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.101 2011/08/31 18:31:03 plunky Exp $");
#include "opt_inet.h"
#include "opt_mrouting.h"
@@ -1911,8 +1911,7 @@
#endif
looutput(mif6table[reg_mif_num].m6_ifp, m,
- (struct sockaddr *)__UNCONST(&dst),
- (struct rtentry *) NULL);
+ (struct sockaddr *)__UNCONST(&dst), NULL);
/* prepare the register head to send to the mrouting daemon */
m = mcp;
Index: src/sys/netinet6/mld6.c
diff -u src/sys/netinet6/mld6.c:1.52 src/sys/netinet6/mld6.c:1.53
--- src/sys/netinet6/mld6.c:1.52 Thu Apr 21 06:58:31 2011
+++ src/sys/netinet6/mld6.c Wed Aug 31 18:31:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mld6.c,v 1.52 2011/04/21 06:58:31 dholland Exp $ */
+/* $NetBSD: mld6.c,v 1.53 2011/08/31 18:31:03 plunky Exp $ */
/* $KAME: mld6.c,v 1.25 2001/01/16 14:14:18 itojun Exp $ */
/*
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.52 2011/04/21 06:58:31 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.53 2011/08/31 18:31:03 plunky Exp $");
#include "opt_inet.h"
@@ -556,7 +556,7 @@
}
ip6_output(mh, &ip6_opts, NULL, ia ? 0 : IPV6_UNSPECSRC,
- &im6o, (struct socket *)NULL, NULL);
+ &im6o, NULL, NULL);
}
static struct mld_hdr *
Index: src/sys/netinet6/udp6_output.c
diff -u src/sys/netinet6/udp6_output.c:1.41 src/sys/netinet6/udp6_output.c:1.42
--- src/sys/netinet6/udp6_output.c:1.41 Thu Jul 15 23:46:55 2010
+++ src/sys/netinet6/udp6_output.c Wed Aug 31 18:31:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: udp6_output.c,v 1.41 2010/07/15 23:46:55 dyoung Exp $ */
+/* $NetBSD: udp6_output.c,v 1.42 2011/08/31 18:31:03 plunky Exp $ */
/* $KAME: udp6_output.c,v 1.43 2001/10/15 09:19:52 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udp6_output.c,v 1.41 2010/07/15 23:46:55 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp6_output.c,v 1.42 2011/08/31 18:31:03 plunky Exp $");
#include "opt_inet.h"
@@ -403,8 +403,7 @@
UDP_STATINC(UDP_STAT_OPACKETS);
error = ip_output(m, NULL, &in6p->in6p_route, flags /* XXX */,
- (struct ip_moptions *)NULL,
- (struct socket *)in6p->in6p_socket);
+ NULL, (struct socket *)in6p->in6p_socket);
break;
#else
error = EAFNOSUPPORT;
Index: src/sys/netipsec/ipsec_output.c
diff -u src/sys/netipsec/ipsec_output.c:1.36 src/sys/netipsec/ipsec_output.c:1.37
--- src/sys/netipsec/ipsec_output.c:1.36 Thu Jun 9 21:04:37 2011
+++ src/sys/netipsec/ipsec_output.c Wed Aug 31 18:31:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_output.c,v 1.36 2011/06/09 21:04:37 drochner Exp $ */
+/* $NetBSD: ipsec_output.c,v 1.37 2011/08/31 18:31:03 plunky Exp $ */
/*-
* Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.36 2011/06/09 21:04:37 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.37 2011/08/31 18:31:03 plunky Exp $");
/*
* IPsec output processing.
@@ -138,7 +138,7 @@
#endif /* __FreeBSD_ */
KERNEL_LOCK(1, NULL);
rv = ip_output(m, NULL, NULL, IP_RAWOUTPUT|IP_NOIPNEWID,
- (struct ip_moptions *)NULL, (struct socket *)NULL);
+ NULL, NULL);
KERNEL_UNLOCK_ONE(NULL);
return rv;
Index: src/sys/netipsec/xform_esp.c
diff -u src/sys/netipsec/xform_esp.c:1.38 src/sys/netipsec/xform_esp.c:1.39
--- src/sys/netipsec/xform_esp.c:1.38 Thu May 26 21:50:02 2011
+++ src/sys/netipsec/xform_esp.c Wed Aug 31 18:31:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_esp.c,v 1.38 2011/05/26 21:50:02 drochner Exp $ */
+/* $NetBSD: xform_esp.c,v 1.39 2011/08/31 18:31:04 plunky Exp $ */
/* $FreeBSD: src/sys/netipsec/xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.38 2011/05/26 21:50:02 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.39 2011/08/31 18:31:04 plunky Exp $");
#include "opt_inet.h"
#ifdef __FreeBSD__
@@ -726,7 +726,7 @@
const struct enc_xform *espx;
const struct auth_hash *esph;
int hlen, rlen, plen, padding, blks, alen, i, roff;
- struct mbuf *mo = (struct mbuf *) NULL;
+ struct mbuf *mo = NULL;
struct tdb_crypto *tc;
const struct secasvar *sav;
struct secasindex *saidx;
Index: src/sys/netiso/tp_inet.c
diff -u src/sys/netiso/tp_inet.c:1.40 src/sys/netiso/tp_inet.c:1.41
--- src/sys/netiso/tp_inet.c:1.40 Sun Jul 17 20:54:54 2011
+++ src/sys/netiso/tp_inet.c Wed Aug 31 18:31:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tp_inet.c,v 1.40 2011/07/17 20:54:54 joerg Exp $ */
+/* $NetBSD: tp_inet.c,v 1.41 2011/08/31 18:31:04 plunky Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tp_inet.c,v 1.40 2011/07/17 20:54:54 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tp_inet.c,v 1.41 2011/08/31 18:31:04 plunky Exp $");
#include "opt_inet.h"
#include "opt_iso.h"
@@ -452,7 +452,7 @@
#endif
error = ip_output(m, (struct mbuf *) 0, ro, IP_ALLOWBROADCAST,
- (struct ip_moptions *)NULL, (struct socket *)NULL);
+ NULL, NULL);
#ifdef ARGO_DEBUG
if (argo_debug[D_EMIT]) {
Index: src/sys/netsmb/smb_trantcp.c
diff -u src/sys/netsmb/smb_trantcp.c:1.43 src/sys/netsmb/smb_trantcp.c:1.44
--- src/sys/netsmb/smb_trantcp.c:1.43 Fri Sep 4 01:41:06 2009
+++ src/sys/netsmb/smb_trantcp.c Wed Aug 31 18:31:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: smb_trantcp.c,v 1.43 2009/09/04 01:41:06 tls Exp $ */
+/* $NetBSD: smb_trantcp.c,v 1.44 2011/08/31 18:31:04 plunky Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smb_trantcp.c,v 1.43 2009/09/04 01:41:06 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_trantcp.c,v 1.44 2011/08/31 18:31:04 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -563,7 +563,7 @@
return ENOTCONN;
if ((so = nbp->nbp_tso) != NULL) {
nbp->nbp_flags &= ~NBF_CONNECTED;
- nbp->nbp_tso = (struct socket *)NULL;
+ nbp->nbp_tso = NULL;
solock(so);
soshutdown(so, 2);
sounlock(so);
