Replace u_intXX_t by their C99 counterparts.

This commit is contained in:
rpaulo 2005-11-30 16:47:58 +00:00
parent 09073ec514
commit 940d1d8665
1 changed files with 13 additions and 13 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: bpf.h,v 1.44 2005/11/30 12:54:42 rpaulo Exp $ */ /* $NetBSD: bpf.h,v 1.45 2005/11/30 16:47:58 rpaulo Exp $ */
/* /*
* Copyright (c) 1990, 1991, 1993 * Copyright (c) 1990, 1991, 1993
@ -72,10 +72,10 @@ struct bpf_program {
* Struct returned by BIOCGSTATS and net.bpf.stats sysctl. * Struct returned by BIOCGSTATS and net.bpf.stats sysctl.
*/ */
struct bpf_stat { struct bpf_stat {
u_int64_t bs_recv; /* number of packets received */ uint64_t bs_recv; /* number of packets received */
u_int64_t bs_drop; /* number of packets dropped */ uint64_t bs_drop; /* number of packets dropped */
u_int64_t bs_capt; /* number of packets captured */ uint64_t bs_capt; /* number of packets captured */
u_int64_t bs_padding[13]; uint64_t bs_padding[13];
}; };
/* /*
@ -140,9 +140,9 @@ struct bpf_version {
*/ */
struct bpf_hdr { struct bpf_hdr {
struct timeval bh_tstamp; /* time stamp */ struct timeval bh_tstamp; /* time stamp */
u_int32_t bh_caplen; /* length of captured portion */ uint32_t bh_caplen; /* length of captured portion */
u_int32_t bh_datalen; /* original length of packet */ uint32_t bh_datalen; /* original length of packet */
u_int16_t bh_hdrlen; /* length of bpf header (this struct uint16_t bh_hdrlen; /* length of bpf header (this struct
plus alignment padding) */ plus alignment padding) */
}; };
/* /*
@ -226,7 +226,7 @@ struct bpf_hdr {
* The instruction data structure. * The instruction data structure.
*/ */
struct bpf_insn { struct bpf_insn {
u_int16_t code; uint16_t code;
u_char jt; u_char jt;
u_char jf; u_char jf;
int32_t k; int32_t k;
@ -235,8 +235,8 @@ struct bpf_insn {
/* /*
* Macros for insn array initializers. * Macros for insn array initializers.
*/ */
#define BPF_STMT(code, k) { (u_int16_t)(code), 0, 0, k } #define BPF_STMT(code, k) { (uint16_t)(code), 0, 0, k }
#define BPF_JUMP(code, k, jt, jf) { (u_int16_t)(code), jt, jf, k } #define BPF_JUMP(code, k, jt, jf) { (uint16_t)(code), jt, jf, k }
/* /*
* Structure to retrieve available DLTs for the interface. * Structure to retrieve available DLTs for the interface.
@ -251,8 +251,8 @@ int bpf_validate(struct bpf_insn *, int);
void bpf_tap(void *, u_char *, u_int); void bpf_tap(void *, u_char *, u_int);
void bpf_mtap(void *, struct mbuf *); void bpf_mtap(void *, struct mbuf *);
void bpf_mtap2(void *, void *, u_int, struct mbuf *); void bpf_mtap2(void *, void *, u_int, struct mbuf *);
void bpf_mtap_af(void *, u_int32_t, struct mbuf *); void bpf_mtap_af(void *, uint32_t, struct mbuf *);
void bpf_mtap_et(void *, u_int16_t, struct mbuf *); void bpf_mtap_et(void *, uint16_t, struct mbuf *);
void bpf_mtap_sl_in(void *, u_char *, struct mbuf **); void bpf_mtap_sl_in(void *, u_char *, struct mbuf **);
void bpf_mtap_sl_out(void *, u_char *, struct mbuf *); void bpf_mtap_sl_out(void *, u_char *, struct mbuf *);
void bpfattach(struct ifnet *, u_int, u_int); void bpfattach(struct ifnet *, u_int, u_int);