more __unused

This commit is contained in:
christos 2006-10-13 20:53:59 +00:00
parent f90c2de688
commit 6c265266c5
13 changed files with 152 additions and 104 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: pci_subr.c,v 1.67 2006/10/13 18:28:06 dogcow Exp $ */
/* $NetBSD: pci_subr.c,v 1.68 2006/10/13 20:53:59 christos Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.67 2006/10/13 18:28:06 dogcow Exp $");
__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.68 2006/10/13 20:53:59 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@ -312,7 +312,7 @@ struct pci_product {
#endif /* PCIVERBOSE */
const char *
pci_findvendor(pcireg_t id_reg)
pci_findvendor(pcireg_t id_reg __unused)
{
#ifdef PCIVERBOSE
pci_vendor_id_t vendor = PCI_VENDOR(id_reg);
@ -328,7 +328,7 @@ pci_findvendor(pcireg_t id_reg)
}
const char *
pci_findproduct(pcireg_t id_reg)
pci_findproduct(pcireg_t id_reg __unused)
{
#ifdef PCIVERBOSE
pci_vendor_id_t vendor = PCI_VENDOR(id_reg);

View File

@ -1,4 +1,4 @@
/* $NetBSD: ipsec.c,v 1.23 2006/06/10 11:30:37 kardel Exp $ */
/* $NetBSD: ipsec.c,v 1.24 2006/10/13 20:53:59 christos Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */
/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.23 2006/06/10 11:30:37 kardel Exp $");
__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.24 2006/10/13 20:53:59 christos Exp $");
/*
* IPsec controller part.
@ -1227,12 +1227,13 @@ fail:
/* set policy and ipsec request if present. */
static int
ipsec_set_policy(pcb_sp, optname, request, len, priv)
struct secpolicy **pcb_sp;
int optname;
caddr_t request;
size_t len;
int priv;
ipsec_set_policy(
struct secpolicy **pcb_sp,
int optname __unused,
caddr_t request,
size_t len,
int priv
)
{
struct sadb_x_policy *xpl;
struct secpolicy *newsp = NULL;

View File

@ -1,4 +1,4 @@
/* $NetBSD: ipsec.h,v 1.15 2006/04/11 20:21:28 rpaulo Exp $ */
/* $NetBSD: ipsec.h,v 1.16 2006/10/13 20:53:59 christos Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.h,v 1.2.4.2 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $ */
@ -259,13 +259,21 @@ extern struct secpolicy * ipsec_getpolicybyaddr(struct mbuf *, u_int,
static __inline struct secpolicy*
ipsec4_getpolicybysock(struct mbuf *m, u_int dir, const struct socket *so, int *err)
ipsec4_getpolicybysock(
struct mbuf *m __unused,
u_int dir __unused,
const struct socket *so __unused,
int *err __unused
)
{
panic("ipsec4_getpolicybysock");
}
static __inline int
ipsec_copy_pcbpolicy(struct inpcbpolicy *old, struct inpcbpolicy *new)
ipsec_copy_pcbpolicy(
struct inpcbpolicy *old __unused,
struct inpcbpolicy *new __unused
)
{
/*XXX do nothing */
return (0);
@ -335,7 +343,8 @@ extern caddr_t m_pad(struct mbuf *m, int n);
extern int m_striphdr(struct mbuf *m, int skip, int hlen);
/* Per-socket caching of IPsec output policy */
static __inline int ipsec_clear_socket_cache(struct mbuf *m)
static __inline
int ipsec_clear_socket_cache(struct mbuf *m __unused)
{
return 0;
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: ipsec_input.c,v 1.11 2005/12/11 12:25:05 christos Exp $ */
/* $NetBSD: ipsec_input.c,v 1.12 2006/10/13 20:53:59 christos Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec_input.c,v 1.2.4.2 2003/03/28 20:32:53 sam Exp $ */
/* $OpenBSD: ipsec_input.c,v 1.63 2003/02/20 18:35:43 deraadt Exp $ */
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.11 2005/12/11 12:25:05 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.12 2006/10/13 20:53:59 christos Exp $");
/*
* IPsec input processing.
@ -252,7 +252,7 @@ ipsec4_common_input(struct mbuf *m, ...)
*/
int
ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav,
int skip, int protoff, struct m_tag *mt)
int skip, int protoff __unused, struct m_tag *mt)
{
int prot, af, sproto;
struct ip *ip;

View File

@ -1,4 +1,4 @@
/* $NetBSD: ipsec_output.c,v 1.14 2005/12/11 12:25:05 christos Exp $ */
/* $NetBSD: ipsec_output.c,v 1.15 2006/10/13 20:53:59 christos 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.14 2005/12/11 12:25:05 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.15 2006/10/13 20:53:59 christos Exp $");
/*
* IPsec output processing.
@ -347,10 +347,11 @@ bad:
*/
int
ipsec4_process_packet(
struct mbuf *m,
struct ipsecrequest *isr,
int flags,
int tunalready)
struct mbuf *m,
struct ipsecrequest *isr,
int flags __unused,
int tunalready
)
{
struct secasindex saidx;
struct secasvar *sav;
@ -539,12 +540,13 @@ ipsec6_splithdr(struct mbuf *m)
*/
int
ipsec6_output_trans(
struct ipsec_output_state *state,
u_char *nexthdrp,
struct mbuf *mprev,
struct secpolicy *sp,
int flags,
int *tun)
struct ipsec_output_state *state,
u_char *nexthdrp __unused,
struct mbuf *mprev __unused,
struct secpolicy *sp,
int flags __unused,
int *tun
)
{
struct ipsecrequest *isr;
struct secasindex saidx;
@ -671,7 +673,11 @@ ipsec6_encapsulate(struct mbuf *m, struct secasvar *sav)
* IPsec output logic for IPv6, tunnel mode.
*/
int
ipsec6_output_tunnel(struct ipsec_output_state *state, struct secpolicy *sp, int flags)
ipsec6_output_tunnel(
struct ipsec_output_state *state,
struct secpolicy *sp,
int flags __unused
)
{
struct ip6_hdr *ip6;
struct ipsecrequest *isr;

View File

@ -1,4 +1,4 @@
/* $NetBSD: key.c,v 1.28 2006/07/23 22:06:13 ad Exp $ */
/* $NetBSD: key.c,v 1.29 2006/10/13 20:53:59 christos Exp $ */
/* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.28 2006/07/23 22:06:13 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.29 2006/10/13 20:53:59 christos Exp $");
/*
* This code is referd to RFC 2367
@ -2404,7 +2404,10 @@ key_spdflush(so, m, mhp)
return key_sendup_mbuf(so, m, KEY_SENDUP_ALL);
}
static struct sockaddr key_src = { 2, PF_KEY, };
static struct sockaddr key_src = {
.sa_len = 2,
.sa_family = PF_KEY,
};
static struct mbuf *
key_setspddump_chain(int *errorp, int *lenp, pid_t pid)
@ -3368,7 +3371,7 @@ key_mature(sav)
switch (sav->sah->saidx.proto) {
case IPPROTO_ESP:
case IPPROTO_AH:
if (ntohl(sav->spi) >= 0 && ntohl(sav->spi) <= 255) {
if (ntohl(sav->spi) <= 255) {
ipseclog((LOG_DEBUG,
"key_mature: illegal range of SPI %u.\n",
(u_int32_t)ntohl(sav->spi)));
@ -4229,7 +4232,7 @@ key_bbcmp(const void *a1, const void *a2, u_int bits)
* XXX: year 2038 problem may remain.
*/
void
key_timehandler(void* arg)
key_timehandler(void* arg __unused)
{
u_int dir;
int s;
@ -4487,8 +4490,8 @@ key_timehandler(void* arg)
}
#ifdef __NetBSD__
void srandom(int arg);
void srandom(int arg) {return;}
void srandom(int);
void srandom(int arg __unused) {return;}
#endif
/*
@ -7403,11 +7406,12 @@ key_init()
* xxx more checks to be provided
*/
int
key_checktunnelsanity(sav, family, src, dst)
struct secasvar *sav;
u_int family;
caddr_t src;
caddr_t dst;
key_checktunnelsanity(
struct secasvar *sav,
u_int family __unused,
caddr_t src __unused,
caddr_t dst __unused
)
{
/* sanity check */
if (sav->sah == NULL)

View File

@ -1,4 +1,4 @@
/* $NetBSD: keysock.c,v 1.10 2006/08/31 23:21:54 matt Exp $ */
/* $NetBSD: keysock.c,v 1.11 2006/10/13 20:53:59 christos Exp $ */
/* $FreeBSD: src/sys/netipsec/keysock.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.10 2006/08/31 23:21:54 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.11 2006/10/13 20:53:59 christos Exp $");
#include "opt_ipsec.h"
@ -72,8 +72,14 @@ struct key_cb {
};
static struct key_cb key_cb;
static struct sockaddr key_dst = { 2, PF_KEY, };
static struct sockaddr key_src = { 2, PF_KEY, };
static struct sockaddr key_dst = {
.sa_len = 2,
.sa_family = PF_KEY,
};
static struct sockaddr key_src = {
.sa_len = 2,
.sa_family = PF_KEY,
};
static int key_sendup0 __P((struct rawcb *, struct mbuf *, int, int));
@ -153,10 +159,12 @@ end:
* send message to the socket.
*/
static int
key_sendup0(rp, m, promisc, sbprio)
struct rawcb *rp;
struct mbuf *m;
int promisc;
key_sendup0(
struct rawcb *rp,
struct mbuf *m,
int promisc,
int sbprio
)
{
int error;
int ok;

View File

@ -1,4 +1,4 @@
/* $NetBSD: xform_ah.c,v 1.10 2006/04/11 20:21:28 rpaulo Exp $ */
/* $NetBSD: xform_ah.c,v 1.11 2006/10/13 20:53:59 christos Exp $ */
/* $FreeBSD: src/sys/netipsec/xform_ah.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */
/*
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.10 2006/04/11 20:21:28 rpaulo Exp $");
__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.11 2006/10/13 20:53:59 christos Exp $");
#include "opt_inet.h"
#ifdef __FreeBSD__
@ -955,11 +955,12 @@ bad:
*/
static int
ah_output(
struct mbuf *m,
struct ipsecrequest *isr,
struct mbuf **mp,
int skip,
int protoff)
struct mbuf *m,
struct ipsecrequest *isr,
struct mbuf **mp __unused,
int skip,
int protoff
)
{
struct secasvar *sav;
struct auth_hash *ahx;
@ -1284,6 +1285,7 @@ bad:
static struct xformsw ah_xformsw = {
XF_AH, XFT_AUTH, "IPsec AH",
ah_init, ah_zeroize, ah_input, ah_output,
NULL,
};
INITFN void

View File

@ -1,4 +1,4 @@
/* $NetBSD: xform_esp.c,v 1.10 2006/04/28 22:39:02 pavel Exp $ */
/* $NetBSD: xform_esp.c,v 1.11 2006/10/13 20:53:59 christos 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.10 2006/04/28 22:39:02 pavel Exp $");
__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.11 2006/10/13 20:53:59 christos Exp $");
#include "opt_inet.h"
#ifdef __FreeBSD__
@ -667,11 +667,11 @@ bad:
*/
static int
esp_output(
struct mbuf *m,
struct ipsecrequest *isr,
struct mbuf **mp,
int skip,
int protoff
struct mbuf *m,
struct ipsecrequest *isr,
struct mbuf **mp __unused,
int skip,
int protoff
)
{
struct enc_xform *espx;
@ -1002,7 +1002,8 @@ bad:
static struct xformsw esp_xformsw = {
XF_ESP, XFT_CONF|XFT_AUTH, "IPsec ESP",
esp_init, esp_zeroize, esp_input,
esp_output
esp_output,
NULL,
};
INITFN void

View File

@ -1,4 +1,4 @@
/* $NetBSD: xform_ipcomp.c,v 1.6 2005/12/11 12:25:06 christos Exp $ */
/* $NetBSD: xform_ipcomp.c,v 1.7 2006/10/13 20:53:59 christos Exp $ */
/* $FreeBSD: src/sys/netipsec/xform_ipcomp.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_ipcomp.c,v 1.1 2001/07/05 12:08:52 jjbg Exp $ */
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.6 2005/12/11 12:25:06 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.7 2006/10/13 20:53:59 christos Exp $");
/* IP payload compression protocol (IPComp), see RFC 2393 */
#include "opt_inet.h"
@ -334,11 +334,11 @@ bad:
*/
static int
ipcomp_output(
struct mbuf *m,
struct ipsecrequest *isr,
struct mbuf **mp,
int skip,
int protoff
struct mbuf *m,
struct ipsecrequest *isr,
struct mbuf **mp __unused,
int skip,
int protoff
)
{
struct secasvar *sav;
@ -602,7 +602,8 @@ bad:
static struct xformsw ipcomp_xformsw = {
XF_IPCOMP, XFT_COMP, "IPcomp",
ipcomp_init, ipcomp_zeroize, ipcomp_input,
ipcomp_output
ipcomp_output,
NULL,
};
INITFN void

View File

@ -1,4 +1,4 @@
/* $NetBSD: xform_ipip.c,v 1.12 2005/12/11 12:25:06 christos Exp $ */
/* $NetBSD: xform_ipip.c,v 1.13 2006/10/13 20:53:59 christos Exp $ */
/* $FreeBSD: src/sys/netipsec/xform_ipip.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_ipip.c,v 1.25 2002/06/10 18:04:55 itojun Exp $ */
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.12 2005/12/11 12:25:06 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.13 2006/10/13 20:53:59 christos Exp $");
/*
* IP-inside-IP processing
@ -138,7 +138,7 @@ static void _ipip_input(struct mbuf *m, int iphlen, struct ifnet *gifp);
* Really only a wrapper for ipip_input(), for use with IPv6.
*/
int
ip4_input6(struct mbuf **m, int *offp, int proto)
ip4_input6(struct mbuf **m, int *offp, int proto __unused)
{
#if 0
/* If we do not accept IP-in-IP explicitly, drop. */
@ -189,7 +189,7 @@ ip4_input(struct mbuf *m, ...)
*/
static void
_ipip_input(struct mbuf *m, int iphlen, struct ifnet *gifp)
_ipip_input(struct mbuf *m, int iphlen, struct ifnet *gifp __unused)
{
register struct sockaddr_in *sin;
register struct ifnet *ifp;
@ -422,11 +422,11 @@ _ipip_input(struct mbuf *m, int iphlen, struct ifnet *gifp)
int
ipip_output(
struct mbuf *m,
struct ipsecrequest *isr,
struct mbuf **mp,
int skip,
int protoff
struct mbuf *m,
struct ipsecrequest *isr,
struct mbuf **mp,
int skip __unused,
int protoff __unused
)
{
struct secasvar *sav;
@ -666,7 +666,12 @@ ipe4_zeroize(struct secasvar *sav)
}
static int
ipe4_input(struct mbuf *m, struct secasvar *sav, int skip, int protoff)
ipe4_input(
struct mbuf *m,
struct secasvar *sav __unused,
int skip __unused,
int protoff __unused
)
{
/* This is a rather serious mistake, so no conditional printing. */
printf("ipe4_input: should never be called\n");
@ -678,6 +683,7 @@ ipe4_input(struct mbuf *m, struct secasvar *sav, int skip, int protoff)
static struct xformsw ipe4_xformsw = {
XF_IP4, 0, "IPv4 Simple Encapsulation",
ipe4_init, ipe4_zeroize, ipe4_input, ipip_output,
NULL,
};
extern struct domain inetdomain;
@ -700,7 +706,11 @@ static struct ipprotosw ipe4_protosw[] = {
* Check the encapsulated packet to see if we want it
*/
static int
ipe4_encapcheck(struct mbuf *m, int off, int proto, void *arg)
ipe4_encapcheck(struct mbuf *m,
int off __unused,
int proto __unused,
void *arg __unused
)
{
/*
* Only take packets coming from IPSEC tunnels; the rest

View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_nqlease.c,v 1.71 2006/10/13 18:28:07 dogcow Exp $ */
/* $NetBSD: nfs_nqlease.c,v 1.72 2006/10/13 20:53:59 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_nqlease.c,v 1.71 2006/10/13 18:28:07 dogcow Exp $");
__KERNEL_RCSID(0, "$NetBSD: nfs_nqlease.c,v 1.72 2006/10/13 20:53:59 christos Exp $");
#include "fs_nfs.h"
#include "opt_nfs.h"
@ -1007,13 +1007,14 @@ nqnfs_callback(struct nfsmount *nmp, struct mbuf *mrep, struct mbuf *md,
* the list asynchronously.
*/
int
nqnfs_clientd(nmp, cred, ncd, flag, argp, l)
struct nfsmount *nmp;
kauth_cred_t cred;
struct nfsd_cargs *ncd;
int flag;
caddr_t argp;
struct lwp *l;
nqnfs_clientd(
struct nfsmount *nmp,
kauth_cred_t cred __unused,
struct nfsd_cargs *ncd,
int flag,
caddr_t argp,
struct lwp *l
)
{
#ifndef NFS_V2_ONLY
struct nfsnode *np;

View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_subs.c,v 1.172 2006/10/13 18:28:07 dogcow Exp $ */
/* $NetBSD: nfs_subs.c,v 1.173 2006/10/13 20:53:59 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.172 2006/10/13 18:28:07 dogcow Exp $");
__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.173 2006/10/13 20:53:59 christos Exp $");
#include "fs_nfs.h"
#include "opt_nfs.h"
@ -589,11 +589,12 @@ int nfs_webnamei __P((struct nameidata *, struct vnode *, struct proc *));
* (just used to decide if a cluster is a good idea)
*/
struct mbuf *
nfsm_reqh(np, procid, hsiz, bposp)
struct nfsnode *np;
u_long procid;
int hsiz;
caddr_t *bposp;
nfsm_reqh(
struct nfsnode *np __unused,
u_long procid __unused,
int hsiz,
caddr_t *bposp
)
{
struct mbuf *mb;
caddr_t bpos;
@ -1925,8 +1926,12 @@ nfs_delayedtruncate(vp)
*/
int
nfs_check_wccdata(struct nfsnode *np, const struct timespec *ctime,
struct timespec *mtime, boolean_t docheck)
nfs_check_wccdata(
struct nfsnode *np __unused,
const struct timespec *ctime __unused,
struct timespec *mtime __unused,
boolean_t docheck __unused
)
{
int error = 0;