prototype must not have variable name

This commit is contained in:
itojun 2003-07-08 07:13:50 +00:00
parent eaed89fec5
commit 91b11e1eba
9 changed files with 114 additions and 145 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_bridgevar.h,v 1.3 2003/03/19 10:34:34 bouyer Exp $ */
/* $NetBSD: if_bridgevar.h,v 1.4 2003/07/08 07:13:50 itojun Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@ -301,9 +301,9 @@ struct bridge_softc {
extern const uint8_t bstp_etheraddr[];
void bridge_ifdetach(struct ifnet *ifp);
void bridge_ifdetach(struct ifnet *);
int bridge_output(struct ifnet *ifp, struct mbuf *, struct sockaddr *,
int bridge_output(struct ifnet *, struct mbuf *, struct sockaddr *,
struct rtentry *);
struct mbuf *bridge_input(struct ifnet *, struct mbuf *);

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_gre.h,v 1.10 2002/02/24 17:22:20 martin Exp $ */
/* $NetBSD: if_gre.h,v 1.11 2003/07/08 07:13:51 itojun Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -153,8 +153,8 @@ extern struct gre_softc_head gre_softc_list;
int gre_ioctl __P((struct ifnet *, u_long, caddr_t));
int gre_output __P((struct ifnet *, struct mbuf *, struct sockaddr *,
struct rtentry *rt));
u_short gre_in_cksum(u_short *p, u_int len);
struct rtentry *));
u_short gre_in_cksum(u_short *, u_int);
#endif /* _KERNEL */
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_media.h,v 1.34 2003/04/23 23:16:43 bjh21 Exp $ */
/* $NetBSD: if_media.h,v 1.35 2003/07/08 07:13:51 itojun Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@ -93,8 +93,8 @@
/*
* Driver callbacks for media status and change requests.
*/
typedef int (*ifm_change_cb_t) __P((struct ifnet *ifp));
typedef void (*ifm_stat_cb_t) __P((struct ifnet *ifp, struct ifmediareq *req));
typedef int (*ifm_change_cb_t) __P((struct ifnet *));
typedef void (*ifm_stat_cb_t) __P((struct ifnet *, struct ifmediareq *));
/*
* In-kernel representation of a single supported media type.
@ -120,25 +120,24 @@ struct ifmedia {
};
/* Initialize an interface's struct if_media field. */
void ifmedia_init __P((struct ifmedia *ifm, int dontcare_mask,
ifm_change_cb_t change_callback, ifm_stat_cb_t status_callback));
void ifmedia_init __P((struct ifmedia *, int, ifm_change_cb_t,
ifm_stat_cb_t));
/* Add one supported medium to a struct ifmedia. */
void ifmedia_add __P((struct ifmedia *ifm, int mword, int data, void *aux));
void ifmedia_add __P((struct ifmedia *, int, int, void *));
/* Add an array (of ifmedia_entry) media to a struct ifmedia. */
void ifmedia_list_add(struct ifmedia *mp, struct ifmedia_entry *lp,
int count);
void ifmedia_list_add(struct ifmedia *, struct ifmedia_entry *, int);
/* Set default media type on initialization. */
void ifmedia_set __P((struct ifmedia *ifm, int mword));
/* Common ioctl function for getting/setting media, called by driver. */
int ifmedia_ioctl __P((struct ifnet *ifp, struct ifreq *ifr,
struct ifmedia *ifm, u_long cmd));
int ifmedia_ioctl __P((struct ifnet *, struct ifreq *, struct ifmedia *,
u_long));
/* Look up a media entry. */
struct ifmedia_entry *ifmedia_match __P((struct ifmedia *ifm, u_int, u_int));
struct ifmedia_entry *ifmedia_match __P((struct ifmedia *, u_int, u_int));
/* Delete all media for a given media instance */
void ifmedia_delete_instance __P((struct ifmedia *, u_int));

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_pppvar.h,v 1.16 2002/09/13 14:32:11 itojun Exp $ */
/* $NetBSD: if_pppvar.h,v 1.17 2003/07/08 07:13:51 itojun Exp $ */
/* Id: if_pppvar.h,v 1.3 1996/07/01 01:04:37 paulus Exp */
/*
@ -148,15 +148,14 @@ struct ppp_softc {
#ifdef _KERNEL
extern struct ppp_softc ppp_softc[];
struct ppp_softc *pppalloc __P((pid_t pid));
void pppdealloc __P((struct ppp_softc *sc));
int pppioctl __P((struct ppp_softc *sc, u_long cmd, caddr_t data,
int flag, struct proc *p));
void ppp_restart __P((struct ppp_softc *sc));
void ppppktin __P((struct ppp_softc *sc, struct mbuf *m, int lost));
struct mbuf *ppp_dequeue __P((struct ppp_softc *sc));
int pppoutput __P((struct ifnet *, struct mbuf *,
struct sockaddr *, struct rtentry *));
struct ppp_softc *pppalloc __P((pid_t));
void pppdealloc __P((struct ppp_softc *));
int pppioctl __P((struct ppp_softc *, u_long, caddr_t, int, struct proc *));
void ppp_restart __P((struct ppp_softc *));
void ppppktin __P((struct ppp_softc *, struct mbuf *, int));
struct mbuf *ppp_dequeue __P((struct ppp_softc *));
int pppoutput __P((struct ifnet *, struct mbuf *, struct sockaddr *,
struct rtentry *));
#endif /* _KERNEL */
#endif /* _NET_IF_PPPVAR_H_ */

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_spppvar.h,v 1.7 2003/01/28 15:36:40 tron Exp $ */
/* $NetBSD: if_spppvar.h,v 1.8 2003/07/08 07:13:52 itojun Exp $ */
/*
* Defines for synchronous PPP/Cisco link level subroutines.
@ -119,16 +119,16 @@ struct sppp {
* ready to communicate (like hardware HDLC) can shortcut
* pp_up from pp_tls, and pp_down from pp_tlf.
*/
void (*pp_up)(struct sppp *sp);
void (*pp_down)(struct sppp *sp);
void (*pp_up)(struct sppp *);
void (*pp_down)(struct sppp *);
/*
* These functions need to be filled in by the lower layer
* (hardware) drivers if they request notification from the
* PPP layer whether the link is actually required. They
* correspond to the tls and tlf actions.
*/
void (*pp_tls)(struct sppp *sp);
void (*pp_tlf)(struct sppp *sp);
void (*pp_tls)(struct sppp *);
void (*pp_tlf)(struct sppp *);
/*
* These (optional) functions may be filled by the hardware
* driver if any notification of established connections
@ -136,8 +136,8 @@ struct sppp {
* state change of the interface state machine should be
* signaled for monitoring purposes (pp_chg).
*/
void (*pp_con)(struct sppp *sp);
void (*pp_chg)(struct sppp *sp, int new_state);
void (*pp_con)(struct sppp *);
void (*pp_chg)(struct sppp *, int);
};
#define PP_KEEPALIVE 0x01 /* use keepalive protocol */
@ -154,12 +154,12 @@ struct sppp {
#define PP_MAX_MRU 2048 /* maximal MRU we want to negotiate */
#ifdef _KERNEL
void sppp_attach (struct ifnet *ifp);
void sppp_detach (struct ifnet *ifp);
void sppp_input (struct ifnet *ifp, struct mbuf *m);
int sppp_ioctl(struct ifnet *ifp, u_long cmd, void *data);
struct mbuf *sppp_dequeue (struct ifnet *ifp);
struct mbuf *sppp_pick(struct ifnet *ifp);
int sppp_isempty (struct ifnet *ifp);
void sppp_flush (struct ifnet *ifp);
void sppp_attach (struct ifnet *);
void sppp_detach (struct ifnet *);
void sppp_input (struct ifnet *, struct mbuf *);
int sppp_ioctl(struct ifnet *, u_long, void *);
struct mbuf *sppp_dequeue (struct ifnet *);
struct mbuf *sppp_pick(struct ifnet *);
int sppp_isempty (struct ifnet *);
void sppp_flush (struct ifnet *);
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: ppp-comp.h,v 1.9 2003/03/27 17:50:28 christos Exp $ */
/* $NetBSD: ppp-comp.h,v 1.10 2003/07/08 07:13:52 itojun Exp $ */
/*
* ppp-comp.h - Definitions for doing PPP packet compression.
@ -66,36 +66,32 @@ struct compressor {
int compress_proto; /* CCP compression protocol number */
/* Allocate space for a compressor (transmit side) */
void *(*comp_alloc) __P((u_char *options, int opt_len));
void *(*comp_alloc) __P((u_char *, int));
/* Free space used by a compressor */
void (*comp_free) __P((void *state));
void (*comp_free) __P((void *));
/* Initialize a compressor */
int (*comp_init) __P((void *state, u_char *options, int opt_len,
int unit, int hdrlen, int debug));
int (*comp_init) __P((void *, u_char *, int, int, int, int));
/* Reset a compressor */
void (*comp_reset) __P((void *state));
void (*comp_reset) __P((void *));
/* Compress a packet */
int (*compress) __P((void *state, PACKETPTR *mret,
PACKETPTR mp, int orig_len, int max_len));
int (*compress) __P((void *, PACKETPTR *, PACKETPTR, int, int));
/* Return compression statistics */
void (*comp_stat) __P((void *state, struct compstat *stats));
void (*comp_stat) __P((void *, struct compstat *));
/* Allocate space for a decompressor (receive side) */
void *(*decomp_alloc) __P((u_char *options, int opt_len));
void *(*decomp_alloc) __P((u_char *, int));
/* Free space used by a decompressor */
void (*decomp_free) __P((void *state));
void (*decomp_free) __P((void *));
/* Initialize a decompressor */
int (*decomp_init) __P((void *state, u_char *options, int opt_len,
int unit, int hdrlen, int mru, int debug));
int (*decomp_init) __P((void *, u_char *, int, int, int, int, int));
/* Reset a decompressor */
void (*decomp_reset) __P((void *state));
void (*decomp_reset) __P((void *));
/* Decompress a packet. */
int (*decompress) __P((void *state, PACKETPTR mp,
PACKETPTR *dmpp));
int (*decompress) __P((void *, PACKETPTR, PACKETPTR *));
/* Update state for an incompressible packet received */
void (*incomp) __P((void *state, PACKETPTR mp));
void (*incomp) __P((void *, PACKETPTR));
/* Return decompression statistics */
void (*decomp_stat) __P((void *state, struct compstat *stats));
void (*decomp_stat) __P((void *, struct compstat *));
};
#endif /* PACKETPTR */

View File

@ -1,4 +1,4 @@
/* $NetBSD: zlib.h,v 1.6 2002/03/13 03:59:35 fvdl Exp $ */
/* $NetBSD: zlib.h,v 1.7 2003/07/08 07:13:52 itojun Exp $ */
/* zlib.h -- interface of the 'zlib' general purpose compression library
version 1.1.4, March 11th, 2002
@ -43,7 +43,7 @@
* For conditions of distribution and use, see copyright notice in zlib.h
*/
/* @(#) $Id: zlib.h,v 1.6 2002/03/13 03:59:35 fvdl Exp $ */
/* @(#) $Id: zlib.h,v 1.7 2003/07/08 07:13:52 itojun Exp $ */
#ifndef _ZCONF_H
#define _ZCONF_H
@ -351,8 +351,8 @@ extern "C" {
crash even in case of corrupted input.
*/
typedef voidpf (*alloc_func) __P((voidpf opaque, uInt items, uInt size));
typedef void (*free_func) __P((voidpf opaque, voidpf address));
typedef voidpf (*alloc_func) __P((voidpf, uInt, uInt));
typedef void (*free_func) __P((voidpf, voidpf));
struct internal_state;
@ -468,7 +468,7 @@ ZEXTERN const char * ZEXPORT zlibVersion __P((void));
*/
/*
ZEXTERN int ZEXPORT deflateInit __P((z_streamp strm, int level));
ZEXTERN int ZEXPORT deflateInit __P((z_streamp, int));
Initializes the internal stream state for compression. The fields
zalloc, zfree and opaque must be initialized before by the caller.
@ -490,7 +490,7 @@ ZEXTERN int ZEXPORT deflateInit __P((z_streamp strm, int level));
*/
ZEXTERN int ZEXPORT deflate __P((z_streamp strm, int flush));
ZEXTERN int ZEXPORT deflate __P((z_streamp, int));
/*
deflate compresses as much data as possible, and stops when the input
buffer becomes empty or the output buffer becomes full. It may introduce some
@ -575,7 +575,7 @@ ZEXTERN int ZEXPORT deflate __P((z_streamp strm, int flush));
*/
ZEXTERN int ZEXPORT deflateEnd __P((z_streamp strm));
ZEXTERN int ZEXPORT deflateEnd __P((z_streamp));
/*
All dynamically allocated data structures for this stream are freed.
This function discards any unprocessed input and does not flush any
@ -590,7 +590,7 @@ ZEXTERN int ZEXPORT deflateEnd __P((z_streamp strm));
/*
ZEXTERN int ZEXPORT inflateInit __P((z_streamp strm));
ZEXTERN int ZEXPORT inflateInit __P((z_streamp));
Initializes the internal stream state for decompression. The fields
next_in, avail_in, zalloc, zfree and opaque must be initialized before by
@ -610,7 +610,7 @@ ZEXTERN int ZEXPORT inflateInit __P((z_streamp strm));
*/
ZEXTERN int ZEXPORT inflate __P((z_streamp strm, int flush));
ZEXTERN int ZEXPORT inflate __P((z_streamp, int));
/*
inflate decompresses as much data as possible, and stops when the input
buffer becomes empty or the output buffer becomes full. It may some
@ -682,7 +682,7 @@ ZEXTERN int ZEXPORT inflate __P((z_streamp strm, int flush));
*/
ZEXTERN int ZEXPORT inflateEnd __P((z_streamp strm));
ZEXTERN int ZEXPORT inflateEnd __P((z_streamp));
/*
All dynamically allocated data structures for this stream are freed.
This function discards any unprocessed input and does not flush any
@ -700,12 +700,7 @@ ZEXTERN int ZEXPORT inflateEnd __P((z_streamp strm));
*/
/*
ZEXTERN int ZEXPORT deflateInit2 __P((z_streamp strm,
int level,
int method,
int windowBits,
int memLevel,
int strategy));
ZEXTERN int ZEXPORT deflateInit2 __P((z_streamp, int, int, int, int, int));
This is another version of deflateInit with more compression options. The
fields next_in, zalloc, zfree and opaque must be initialized before by
@ -743,9 +738,7 @@ ZEXTERN int ZEXPORT deflateInit2 __P((z_streamp strm,
not perform any compression: this will be done by deflate().
*/
ZEXTERN int ZEXPORT deflateSetDictionary __P((z_streamp strm,
const Bytef *dictionary,
uInt dictLength));
ZEXTERN int ZEXPORT deflateSetDictionary __P((z_streamp, const Bytef *, uInt));
/*
Initializes the compression dictionary from the given byte sequence
without producing any compressed output. This function must be called
@ -779,8 +772,7 @@ ZEXTERN int ZEXPORT deflateSetDictionary __P((z_streamp strm,
perform any compression: this will be done by deflate().
*/
ZEXTERN int ZEXPORT deflateCopy __P((z_streamp dest,
z_streamp source));
ZEXTERN int ZEXPORT deflateCopy __P((z_streamp, z_streamp));
/*
Sets the destination stream as a complete copy of the source stream.
@ -797,7 +789,7 @@ ZEXTERN int ZEXPORT deflateCopy __P((z_streamp dest,
destination.
*/
extern int inflateIncomp __P((z_stream *strm));
extern int inflateIncomp __P((z_stream *));
/*
This function adds the data at next_in (avail_in bytes) to the output
history without performing any output. There must be no pending output,
@ -806,7 +798,7 @@ extern int inflateIncomp __P((z_stream *strm));
containing the data at next_in (except that the data is not output).
*/
ZEXTERN int ZEXPORT deflateReset __P((z_streamp strm));
ZEXTERN int ZEXPORT deflateReset __P((z_streamp));
/*
This function is equivalent to deflateEnd followed by deflateInit,
but does not free and reallocate all the internal compression state.
@ -817,9 +809,7 @@ ZEXTERN int ZEXPORT deflateReset __P((z_streamp strm));
stream state was inconsistent (such as zalloc or state being NULL).
*/
ZEXTERN int ZEXPORT deflateParams __P((z_streamp strm,
int level,
int strategy));
ZEXTERN int ZEXPORT deflateParams __P((z_streamp, int, int));
/*
Dynamically update the compression level and compression strategy. The
interpretation of level and strategy is as in deflateInit2. This can be
@ -838,7 +828,7 @@ ZEXTERN int ZEXPORT deflateParams __P((z_streamp strm,
if strm->avail_out was zero.
*/
ZEXTERN int ZEXPORT deflateOutputPending __P((z_streamp strm));
ZEXTERN int ZEXPORT deflateOutputPending __P((z_streamp));
/*
Returns the number of bytes of output which are immediately
available from the compressor (i.e. without any further input
@ -846,8 +836,7 @@ ZEXTERN int ZEXPORT deflateOutputPending __P((z_streamp strm));
*/
/*
ZEXTERN int ZEXPORT inflateInit2 __P((z_streamp strm,
int windowBits));
ZEXTERN int ZEXPORT inflateInit2 __P((z_streamp, int));
This is another version of inflateInit with an extra parameter. The
fields next_in, avail_in, zalloc, zfree and opaque must be initialized
@ -868,9 +857,7 @@ ZEXTERN int ZEXPORT inflateInit2 __P((z_streamp strm,
modified, but next_out and avail_out are unchanged.)
*/
ZEXTERN int ZEXPORT inflateSetDictionary __P((z_streamp strm,
const Bytef *dictionary,
uInt dictLength));
ZEXTERN int ZEXPORT inflateSetDictionary __P((z_streamp, const Bytef *, uInt));
/*
Initializes the decompression dictionary from the given uncompressed byte
sequence. This function must be called immediately after a call of inflate
@ -887,7 +874,7 @@ ZEXTERN int ZEXPORT inflateSetDictionary __P((z_streamp strm,
inflate().
*/
ZEXTERN int ZEXPORT inflateSync __P((z_streamp strm));
ZEXTERN int ZEXPORT inflateSync __P((z_streamp));
/*
Skips invalid compressed data until a full flush point (see above the
description of deflate with Z_FULL_FLUSH) can be found, or until all
@ -902,7 +889,7 @@ ZEXTERN int ZEXPORT inflateSync __P((z_streamp strm));
until success or end of the input data.
*/
ZEXTERN int ZEXPORT inflateReset __P((z_streamp strm));
ZEXTERN int ZEXPORT inflateReset __P((z_streamp));
/*
This function is equivalent to inflateEnd followed by inflateInit,
but does not free and reallocate all the internal decompression state.
@ -923,8 +910,7 @@ ZEXTERN int ZEXPORT inflateReset __P((z_streamp strm));
utility functions can easily be modified if you need special options.
*/
ZEXTERN int ZEXPORT compress __P((Bytef *dest, uLongf *destLen,
const Bytef *source, uLong sourceLen));
ZEXTERN int ZEXPORT compress __P((Bytef *, uLongf *, const Bytef *, uLong));
/*
Compresses the source buffer into the destination buffer. sourceLen is
the byte length of the source buffer. Upon entry, destLen is the total
@ -938,9 +924,8 @@ ZEXTERN int ZEXPORT compress __P((Bytef *dest, uLongf *destLen,
buffer.
*/
ZEXTERN int ZEXPORT compress2 __P((Bytef *dest, uLongf *destLen,
const Bytef *source, uLong sourceLen,
int level));
ZEXTERN int ZEXPORT compress2 __P((Bytef *, uLongf *, const Bytef *,
uLong, int));
/*
Compresses the source buffer into the destination buffer. The level
parameter has the same meaning as in deflateInit. sourceLen is the byte
@ -953,8 +938,7 @@ ZEXTERN int ZEXPORT compress2 __P((Bytef *dest, uLongf *destLen,
Z_STREAM_ERROR if the level parameter is invalid.
*/
ZEXTERN int ZEXPORT uncompress __P((Bytef *dest, uLongf *destLen,
const Bytef *source, uLong sourceLen));
ZEXTERN int ZEXPORT uncompress __P((Bytef *, uLongf *, const Bytef *, uLong));
/*
Decompresses the source buffer into the destination buffer. sourceLen is
the byte length of the source buffer. Upon entry, destLen is the total
@ -974,7 +958,7 @@ ZEXTERN int ZEXPORT uncompress __P((Bytef *dest, uLongf *destLen,
typedef voidp gzFile;
ZEXTERN gzFile ZEXPORT gzopen __P((const char *path, const char *mode));
ZEXTERN gzFile ZEXPORT gzopen __P((const char *, const char *));
/*
Opens a gzip (.gz) file for reading or writing. The mode parameter
is as in fopen ("rb" or "wb") but can also include a compression level
@ -990,7 +974,7 @@ ZEXTERN gzFile ZEXPORT gzopen __P((const char *path, const char *mode));
can be checked to distinguish the two cases (if errno is zero, the
zlib error is Z_MEM_ERROR). */
ZEXTERN gzFile ZEXPORT gzdopen __P((int fd, const char *mode));
ZEXTERN gzFile ZEXPORT gzdopen __P((int, const char *));
/*
gzdopen() associates a gzFile with the file descriptor fd. File
descriptors are obtained from calls like open, dup, creat, pipe or
@ -1003,7 +987,7 @@ ZEXTERN gzFile ZEXPORT gzdopen __P((int fd, const char *mode));
the (de)compression state.
*/
ZEXTERN int ZEXPORT gzsetparams __P((gzFile file, int level, int strategy));
ZEXTERN int ZEXPORT gzsetparams __P((gzFile, int, int));
/*
Dynamically update the compression level or strategy. See the description
of deflateInit2 for the meaning of these parameters.
@ -1011,7 +995,7 @@ ZEXTERN int ZEXPORT gzsetparams __P((gzFile file, int level, int strategy));
opened for writing.
*/
ZEXTERN int ZEXPORT gzread __P((gzFile file, voidp buf, unsigned len));
ZEXTERN int ZEXPORT gzread __P((gzFile, voidp, unsigned));
/*
Reads the given number of uncompressed bytes from the compressed file.
If the input file was not in gzip format, gzread copies the given number
@ -1019,15 +1003,14 @@ ZEXTERN int ZEXPORT gzread __P((gzFile file, voidp buf, unsigned len));
gzread returns the number of uncompressed bytes actually read (0 for
end of file, -1 for error). */
ZEXTERN int ZEXPORT gzwrite __P((gzFile file,
const voidp buf, unsigned len));
ZEXTERN int ZEXPORT gzwrite __P((gzFile, const voidp, unsigned));
/*
Writes the given number of uncompressed bytes into the compressed file.
gzwrite returns the number of uncompressed bytes actually written
(0 in case of error).
*/
ZEXTERN int ZEXPORTVA gzprintf __P((gzFile file, const char *format, ...))
ZEXTERN int ZEXPORTVA gzprintf __P((gzFile, const char *, ...))
__attribute__((__format__(__printf__, 2, 3)));
/*
Converts, formats, and writes the args to the compressed file under
@ -1035,14 +1018,14 @@ ZEXTERN int ZEXPORTVA gzprintf __P((gzFile file, const char *format, ...))
uncompressed bytes actually written (0 in case of error).
*/
ZEXTERN int ZEXPORT gzputs __P((gzFile file, const char *s));
ZEXTERN int ZEXPORT gzputs __P((gzFile, const char *));
/*
Writes the given null-terminated string to the compressed file, excluding
the terminating null character.
gzputs returns the number of characters written, or -1 in case of error.
*/
ZEXTERN char * ZEXPORT gzgets __P((gzFile file, char *buf, int len));
ZEXTERN char * ZEXPORT gzgets __P((gzFile, char *, int));
/*
Reads bytes from the compressed file until len-1 characters are read, or
a newline character is read and transferred to buf, or an end-of-file
@ -1051,19 +1034,19 @@ ZEXTERN char * ZEXPORT gzgets __P((gzFile file, char *buf, int len));
gzgets returns buf, or Z_NULL in case of error.
*/
ZEXTERN int ZEXPORT gzputc __P((gzFile file, int c));
ZEXTERN int ZEXPORT gzputc __P((gzFile, int));
/*
Writes c, converted to an unsigned char, into the compressed file.
gzputc returns the value that was written, or -1 in case of error.
*/
ZEXTERN int ZEXPORT gzgetc __P((gzFile file));
ZEXTERN int ZEXPORT gzgetc __P((gzFile));
/*
Reads one byte from the compressed file. gzgetc returns this byte
or -1 in case of end of file or error.
*/
ZEXTERN int ZEXPORT gzflush __P((gzFile file, int flush));
ZEXTERN int ZEXPORT gzflush __P((gzFile, int));
/*
Flushes all pending output into the compressed file. The parameter
flush is as in the deflate() function. The return value is the zlib
@ -1078,8 +1061,7 @@ ZEXTERN int ZEXPORT gzflush __P((gzFile file, int flush));
* NetBSD note:
* "long" gzseek has been there till Oct 1999 (1.4L), which was wrong.
*/
ZEXTERN z_off_t ZEXPORT gzseek __P((gzFile file,
z_off_t offset, int whence));
ZEXTERN z_off_t ZEXPORT gzseek __P((gzFile, z_off_t, int));
/*
Sets the starting position for the next gzread or gzwrite on the
given compressed file. The offset represents a number of bytes in the
@ -1096,7 +1078,7 @@ ZEXTERN z_off_t ZEXPORT gzseek __P((gzFile file,
would be before the current position.
*/
ZEXTERN int ZEXPORT gzrewind __P((gzFile file));
ZEXTERN int ZEXPORT gzrewind __P((gzFile));
/*
Rewinds the given file. This function is supported only for reading.
@ -1107,7 +1089,7 @@ ZEXTERN int ZEXPORT gzrewind __P((gzFile file));
* NetBSD note:
* "long" gztell has been there till Oct 1999 (1.4L), which was wrong.
*/
ZEXTERN z_off_t ZEXPORT gztell __P((gzFile file));
ZEXTERN z_off_t ZEXPORT gztell __P((gzFile));
/*
Returns the starting position for the next gzread or gzwrite on the
given compressed file. This position represents a number of bytes in the
@ -1116,20 +1098,20 @@ ZEXTERN z_off_t ZEXPORT gztell __P((gzFile file));
gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
*/
ZEXTERN int ZEXPORT gzeof __P((gzFile file));
ZEXTERN int ZEXPORT gzeof __P((gzFile));
/*
Returns 1 when EOF has previously been detected reading the given
input stream, otherwise zero.
*/
ZEXTERN int ZEXPORT gzclose __P((gzFile file));
ZEXTERN int ZEXPORT gzclose __P((gzFile));
/*
Flushes all pending output if necessary, closes the compressed file
and deallocates all the (de)compression state. The return value is the zlib
error number (see function gzerror below).
*/
ZEXTERN const char * ZEXPORT gzerror __P((gzFile file, int *errnum));
ZEXTERN const char * ZEXPORT gzerror __P((gzFile, int *));
/*
Returns the error message for the last error which occurred on the
given compressed file. errnum is set to zlib error number. If an
@ -1146,7 +1128,7 @@ ZEXTERN const char * ZEXPORT gzerror __P((gzFile file, int *errnum));
compression library.
*/
ZEXTERN uLong ZEXPORT adler32 __P((uLong adler, const Bytef *buf, uInt len));
ZEXTERN uLong ZEXPORT adler32 __P((uLong, const Bytef *, uInt));
/*
Update a running Adler-32 checksum with the bytes buf[0..len-1] and
@ -1163,7 +1145,7 @@ ZEXTERN uLong ZEXPORT adler32 __P((uLong adler, const Bytef *buf, uInt len));
if (adler != original_adler) error();
*/
ZEXTERN uLong ZEXPORT crc32 __P((uLong crc, const Bytef *buf, uInt len));
ZEXTERN uLong ZEXPORT crc32 __P((uLong, const Bytef *, uInt));
/*
Update a running crc with the bytes buf[0..len-1] and return the updated
crc. If buf is NULL, this function returns the required initial value
@ -1185,16 +1167,11 @@ ZEXTERN uLong ZEXPORT crc32 __P((uLong crc, const Bytef *buf, uInt len));
/* deflateInit and inflateInit are macros to allow checking the zlib version
* and the compiler's view of z_stream:
*/
ZEXTERN int ZEXPORT deflateInit_ __P((z_streamp strm, int level,
const char *version, int stream_size));
ZEXTERN int ZEXPORT inflateInit_ __P((z_streamp strm,
const char *version, int stream_size));
ZEXTERN int ZEXPORT deflateInit2_ __P((z_streamp strm, int level, int method,
int windowBits, int memLevel,
int strategy, const char *version,
int stream_size));
ZEXTERN int ZEXPORT inflateInit2_ __P((z_streamp strm, int windowBits,
const char *version, int stream_size));
ZEXTERN int ZEXPORT deflateInit_ __P((z_streamp, int, const char *, int));
ZEXTERN int ZEXPORT inflateInit_ __P((z_streamp, const char *, int));
ZEXTERN int ZEXPORT deflateInit2_ __P((z_streamp, int, int, int, int,
int, const char *, int));
ZEXTERN int ZEXPORT inflateInit2_ __P((z_streamp, int, const char *, int));
#define deflateInit(strm, level) \
deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream))
#define inflateInit(strm) \
@ -1210,8 +1187,8 @@ ZEXTERN int ZEXPORT inflateInit2_ __P((z_streamp strm, int windowBits,
struct internal_state {int dummy;}; /* hack for buggy compilers */
#endif
ZEXTERN const char * ZEXPORT zError __P((int err));
ZEXTERN int ZEXPORT inflateSyncPoint __P((z_streamp z));
ZEXTERN const char * ZEXPORT zError __P((int));
ZEXTERN int ZEXPORT inflateSyncPoint __P((z_streamp));
ZEXTERN const uLongf * ZEXPORT get_crc_table __P((void));
#ifdef __cplusplus

View File

@ -1,4 +1,4 @@
/* $NetBSD: ip6_var.h,v 1.26 2003/06/29 22:32:02 fvdl Exp $ */
/* $NetBSD: ip6_var.h,v 1.27 2003/07/08 07:20:11 itojun Exp $ */
/* $KAME: ip6_var.h,v 1.33 2000/06/11 14:59:20 jinmei Exp $ */
/*
@ -283,7 +283,7 @@ void frag6_slowtimo __P((void));
void frag6_drain __P((void));
void rip6_init __P((void));
int rip6_input __P((struct mbuf **mp, int *offp, int proto));
int rip6_input __P((struct mbuf **, int *, int));
void rip6_ctlinput __P((int, struct sockaddr *, void *));
int rip6_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
int rip6_output __P((struct mbuf *, ...));

View File

@ -1,4 +1,4 @@
/* $NetBSD: ipsec.h,v 1.31 2002/11/02 07:30:59 perry Exp $ */
/* $NetBSD: ipsec.h,v 1.32 2003/07/08 07:20:12 itojun Exp $ */
/* $KAME: ipsec.h,v 1.51 2001/08/05 04:52:58 itojun Exp $ */
/*
@ -352,10 +352,9 @@ extern int ipsec_copy_pcbpolicy
__P((struct inpcbpolicy *, struct inpcbpolicy *));
extern u_int ipsec_get_reqlevel __P((struct ipsecrequest *, int));
extern int ipsec4_set_policy __P((struct inpcb *inp, int optname,
caddr_t request, size_t len, int priv));
extern int ipsec4_get_policy __P((struct inpcb *inpcb, caddr_t request,
size_t len, struct mbuf **mp));
extern int ipsec4_set_policy __P((struct inpcb *, int, caddr_t, size_t, int));
extern int ipsec4_get_policy __P((struct inpcb *, caddr_t, size_t,
struct mbuf **));
extern int ipsec4_delete_pcbpolicy __P((struct inpcb *));
extern int ipsec4_in_reject_so __P((struct mbuf *, struct socket *));
extern int ipsec4_in_reject __P((struct mbuf *, struct inpcb *));
@ -363,10 +362,9 @@ extern int ipsec4_in_reject __P((struct mbuf *, struct inpcb *));
#ifdef INET6
extern int ipsec6_in_reject_so __P((struct mbuf *, struct socket *));
extern int ipsec6_delete_pcbpolicy __P((struct in6pcb *));
extern int ipsec6_set_policy __P((struct in6pcb *in6p, int optname,
caddr_t request, size_t len, int priv));
extern int ipsec6_get_policy __P((struct in6pcb *in6p, caddr_t request,
size_t len, struct mbuf **mp));
extern int ipsec6_set_policy __P((struct in6pcb *, int, caddr_t, size_t, int));
extern int ipsec6_get_policy __P((struct in6pcb *, caddr_t, size_t,
struct mbuf **));
extern int ipsec6_in_reject __P((struct mbuf *, struct in6pcb *));
#endif /* INET6 */