Consistently use the BSD u_int and u_short instead of the SYSV uint and
ushort. In most of these files, there was a mixture of both styles and this change just makes them self-consistent. Requested by: bde (kern_ktrace.c)
This commit is contained in:
parent
cccd491d52
commit
8b149b5131
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=118607
@ -263,7 +263,7 @@ biospnp_call(int func, const char *fmt, ...)
|
||||
switch(*p) {
|
||||
|
||||
case 'w':
|
||||
i = va_arg(ap, uint);
|
||||
i = va_arg(ap, u_int);
|
||||
*(u_int16_t *)argp = i;
|
||||
argp += sizeof(u_int16_t);
|
||||
break;
|
||||
|
@ -314,7 +314,7 @@ struct aac_softc
|
||||
/* command/fib resources */
|
||||
bus_dma_tag_t aac_fib_dmat; /* DMA tag for allocing FIBs */
|
||||
TAILQ_HEAD(,aac_fibmap) aac_fibmap_tqh;
|
||||
uint total_fibs;
|
||||
u_int total_fibs;
|
||||
struct aac_command *aac_commands;
|
||||
|
||||
/* command management */
|
||||
|
@ -132,7 +132,7 @@ acpi_pcib_acpi_attach(device_t dev)
|
||||
{
|
||||
struct acpi_hpcib_softc *sc;
|
||||
ACPI_STATUS status;
|
||||
uint addr, slot, func, busok;
|
||||
u_int addr, slot, func, busok;
|
||||
uint8_t busno;
|
||||
|
||||
ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
|
||||
|
@ -114,48 +114,48 @@ typedef struct digi_struct digi_t;
|
||||
|
||||
|
||||
struct global_data {
|
||||
volatile ushort cin;
|
||||
volatile ushort cout;
|
||||
volatile ushort cstart;
|
||||
volatile ushort cmax;
|
||||
volatile ushort ein;
|
||||
volatile ushort eout;
|
||||
volatile ushort istart;
|
||||
volatile ushort imax;
|
||||
volatile u_short cin;
|
||||
volatile u_short cout;
|
||||
volatile u_short cstart;
|
||||
volatile u_short cmax;
|
||||
volatile u_short ein;
|
||||
volatile u_short eout;
|
||||
volatile u_short istart;
|
||||
volatile u_short imax;
|
||||
};
|
||||
|
||||
|
||||
struct board_chan {
|
||||
int filler1;
|
||||
int filler2;
|
||||
volatile ushort tseg;
|
||||
volatile ushort tin;
|
||||
volatile ushort tout;
|
||||
volatile ushort tmax;
|
||||
volatile u_short tseg;
|
||||
volatile u_short tin;
|
||||
volatile u_short tout;
|
||||
volatile u_short tmax;
|
||||
|
||||
volatile ushort rseg;
|
||||
volatile ushort rin;
|
||||
volatile ushort rout;
|
||||
volatile ushort rmax;
|
||||
volatile u_short rseg;
|
||||
volatile u_short rin;
|
||||
volatile u_short rout;
|
||||
volatile u_short rmax;
|
||||
|
||||
volatile ushort tlow;
|
||||
volatile ushort rlow;
|
||||
volatile ushort rhigh;
|
||||
volatile ushort incr;
|
||||
volatile u_short tlow;
|
||||
volatile u_short rlow;
|
||||
volatile u_short rhigh;
|
||||
volatile u_short incr;
|
||||
|
||||
volatile ushort etime;
|
||||
volatile ushort edelay;
|
||||
volatile u_short etime;
|
||||
volatile u_short edelay;
|
||||
volatile u_char *dev;
|
||||
|
||||
volatile ushort iflag;
|
||||
volatile ushort oflag;
|
||||
volatile ushort cflag;
|
||||
volatile ushort gmask;
|
||||
volatile u_short iflag;
|
||||
volatile u_short oflag;
|
||||
volatile u_short cflag;
|
||||
volatile u_short gmask;
|
||||
|
||||
volatile ushort col;
|
||||
volatile ushort delay;
|
||||
volatile ushort imask;
|
||||
volatile ushort tflush;
|
||||
volatile u_short col;
|
||||
volatile u_short delay;
|
||||
volatile u_short imask;
|
||||
volatile u_short tflush;
|
||||
|
||||
int filler3;
|
||||
int filler4;
|
||||
@ -274,8 +274,8 @@ struct board_info {
|
||||
u_char status;
|
||||
u_char type;
|
||||
u_char altpin;
|
||||
ushort numports;
|
||||
ushort port;
|
||||
u_short numports;
|
||||
u_short port;
|
||||
u_long membase;
|
||||
};
|
||||
|
||||
@ -313,19 +313,19 @@ struct channel {
|
||||
u_char fepstartca;
|
||||
u_char txwin;
|
||||
u_char rxwin;
|
||||
ushort fepiflag;
|
||||
ushort fepcflag;
|
||||
ushort fepoflag;
|
||||
ushort txbufhead;
|
||||
ushort txbufsize;
|
||||
ushort rxbufhead;
|
||||
ushort rxbufsize;
|
||||
u_short fepiflag;
|
||||
u_short fepcflag;
|
||||
u_short fepoflag;
|
||||
u_short txbufhead;
|
||||
u_short txbufsize;
|
||||
u_short rxbufhead;
|
||||
u_short rxbufsize;
|
||||
int close_delay;
|
||||
int count;
|
||||
int blocked_open;
|
||||
int event;
|
||||
int asyncflags;
|
||||
uint dev;
|
||||
u_int dev;
|
||||
long session;
|
||||
long pgrp;
|
||||
u_long statusflags;
|
||||
|
@ -1815,7 +1815,7 @@ fepcmd(struct digi_p *port, int cmd, int op1, int ncmds)
|
||||
head = port->sc->gdata->cin;
|
||||
mem[head + 0] = cmd;
|
||||
mem[head + 1] = port->pnum;
|
||||
*(ushort *)(mem + head + 2) = op1;
|
||||
*(u_short *)(mem + head + 2) = op1;
|
||||
|
||||
head = (head + 4) & port->sc->gdata->cmax;
|
||||
port->sc->gdata->cin = head;
|
||||
|
@ -67,8 +67,8 @@ struct digi_p {
|
||||
#define PAUSE_RX 16
|
||||
|
||||
int opencnt;
|
||||
ushort txbufsize;
|
||||
ushort rxbufsize;
|
||||
u_short txbufsize;
|
||||
u_short rxbufsize;
|
||||
volatile struct board_chan *bc;
|
||||
struct tty *tp;
|
||||
|
||||
@ -151,7 +151,7 @@ struct digi_softc {
|
||||
|
||||
const char *name;
|
||||
enum digi_board_status status;
|
||||
ushort numports; /* number of ports on card */
|
||||
u_short numports; /* number of ports on card */
|
||||
u_int port; /* I/O port */
|
||||
u_int wport; /* window select I/O port */
|
||||
|
||||
|
@ -30,52 +30,52 @@
|
||||
*/
|
||||
|
||||
struct global_data {
|
||||
volatile ushort cin;
|
||||
volatile ushort cout;
|
||||
volatile ushort cstart;
|
||||
volatile ushort cmax;
|
||||
volatile ushort ein;
|
||||
volatile ushort eout;
|
||||
volatile ushort istart;
|
||||
volatile ushort imax;
|
||||
volatile u_short cin;
|
||||
volatile u_short cout;
|
||||
volatile u_short cstart;
|
||||
volatile u_short cmax;
|
||||
volatile u_short ein;
|
||||
volatile u_short eout;
|
||||
volatile u_short istart;
|
||||
volatile u_short imax;
|
||||
};
|
||||
|
||||
|
||||
struct board_chan {
|
||||
volatile ushort tpjmp;
|
||||
volatile ushort tcjmp;
|
||||
volatile ushort fil1;
|
||||
volatile ushort rpjmp;
|
||||
volatile u_short tpjmp;
|
||||
volatile u_short tcjmp;
|
||||
volatile u_short fil1;
|
||||
volatile u_short rpjmp;
|
||||
|
||||
volatile ushort tseg;
|
||||
volatile ushort tin;
|
||||
volatile ushort tout;
|
||||
volatile ushort tmax;
|
||||
volatile u_short tseg;
|
||||
volatile u_short tin;
|
||||
volatile u_short tout;
|
||||
volatile u_short tmax;
|
||||
|
||||
volatile ushort rseg;
|
||||
volatile ushort rin;
|
||||
volatile ushort rout;
|
||||
volatile ushort rmax;
|
||||
volatile u_short rseg;
|
||||
volatile u_short rin;
|
||||
volatile u_short rout;
|
||||
volatile u_short rmax;
|
||||
|
||||
volatile ushort tlow;
|
||||
volatile ushort rlow;
|
||||
volatile ushort rhigh;
|
||||
volatile ushort incr;
|
||||
volatile u_short tlow;
|
||||
volatile u_short rlow;
|
||||
volatile u_short rhigh;
|
||||
volatile u_short incr;
|
||||
|
||||
volatile ushort dev;
|
||||
volatile ushort edelay;
|
||||
volatile ushort blen;
|
||||
volatile ushort btime;
|
||||
volatile u_short dev;
|
||||
volatile u_short edelay;
|
||||
volatile u_short blen;
|
||||
volatile u_short btime;
|
||||
|
||||
volatile ushort iflag;
|
||||
volatile ushort oflag;
|
||||
volatile ushort cflag;
|
||||
volatile ushort gmask;
|
||||
volatile u_short iflag;
|
||||
volatile u_short oflag;
|
||||
volatile u_short cflag;
|
||||
volatile u_short gmask;
|
||||
|
||||
volatile ushort col;
|
||||
volatile ushort delay;
|
||||
volatile ushort imask;
|
||||
volatile ushort tflush;
|
||||
volatile u_short col;
|
||||
volatile u_short delay;
|
||||
volatile u_short imask;
|
||||
volatile u_short tflush;
|
||||
|
||||
volatile u_char _1[16];
|
||||
|
||||
|
@ -3153,7 +3153,7 @@ ed_hpp_write_mbufs(struct ed_softc *sc, struct mbuf *m, int dst)
|
||||
/* finish the last word of the previous mbuf */
|
||||
if (wantbyte) {
|
||||
savebyte[1] = *data;
|
||||
*d = *((ushort *) savebyte);
|
||||
*d = *((u_short *) savebyte);
|
||||
data++; len--; wantbyte = 0;
|
||||
}
|
||||
/* output contiguous words */
|
||||
|
@ -136,7 +136,7 @@ struct en_rxslot {
|
||||
struct en_vcc {
|
||||
struct atmio_vcc vcc; /* required by common code */
|
||||
void *rxhand;
|
||||
uint vflags;
|
||||
u_int vflags;
|
||||
uint32_t ipackets;
|
||||
uint32_t opackets;
|
||||
uint32_t ibytes;
|
||||
|
@ -168,7 +168,7 @@ LIST_HEAD(rbuf_list, rbuf);
|
||||
struct card_vcc {
|
||||
struct atmio_vcc param; /* traffic parameters */
|
||||
void *rxhand;
|
||||
uint vflags;
|
||||
u_int vflags;
|
||||
uint32_t ipackets;
|
||||
uint32_t opackets;
|
||||
uint32_t ibytes;
|
||||
|
@ -132,9 +132,9 @@ static int nshift;
|
||||
|
||||
struct indir {
|
||||
uintptr_t *array;
|
||||
uint total;
|
||||
uint used;
|
||||
uint shift;
|
||||
u_int total;
|
||||
u_int used;
|
||||
u_int shift;
|
||||
};
|
||||
|
||||
struct md_s {
|
||||
@ -174,7 +174,7 @@ struct md_s {
|
||||
static int mddestroy(struct md_s *sc, struct thread *td);
|
||||
|
||||
static struct indir *
|
||||
new_indir(uint shift)
|
||||
new_indir(u_int shift)
|
||||
{
|
||||
struct indir *ip;
|
||||
|
||||
|
@ -240,7 +240,7 @@ static int cbb_cardbus_deactivate_resource(device_t brdev,
|
||||
device_t child, int type, int rid, struct resource *res);
|
||||
static struct resource *cbb_cardbus_alloc_resource(device_t brdev,
|
||||
device_t child, int type, int *rid, u_long start,
|
||||
u_long end, u_long count, uint flags);
|
||||
u_long end, u_long count, u_int flags);
|
||||
static int cbb_cardbus_release_resource(device_t brdev, device_t child,
|
||||
int type, int rid, struct resource *res);
|
||||
static int cbb_power_enable_socket(device_t brdev, device_t child);
|
||||
@ -251,7 +251,7 @@ static int cbb_deactivate_resource(device_t brdev, device_t child,
|
||||
int type, int rid, struct resource *r);
|
||||
static struct resource *cbb_alloc_resource(device_t brdev, device_t child,
|
||||
int type, int *rid, u_long start, u_long end, u_long count,
|
||||
uint flags);
|
||||
u_int flags);
|
||||
static int cbb_release_resource(device_t brdev, device_t child,
|
||||
int type, int rid, struct resource *r);
|
||||
static int cbb_read_ivar(device_t brdev, device_t child, int which,
|
||||
@ -1515,7 +1515,7 @@ cbb_cardbus_deactivate_resource(device_t brdev, device_t child, int type,
|
||||
|
||||
static struct resource *
|
||||
cbb_cardbus_alloc_resource(device_t brdev, device_t child, int type,
|
||||
int *rid, u_long start, u_long end, u_long count, uint flags)
|
||||
int *rid, u_long start, u_long end, u_long count, u_int flags)
|
||||
{
|
||||
struct cbb_softc *sc = device_get_softc(brdev);
|
||||
int tmp;
|
||||
@ -1663,7 +1663,7 @@ cbb_pcic_deactivate_resource(device_t brdev, device_t child, int type,
|
||||
|
||||
static struct resource *
|
||||
cbb_pcic_alloc_resource(device_t brdev, device_t child, int type, int *rid,
|
||||
u_long start, u_long end, u_long count, uint flags)
|
||||
u_long start, u_long end, u_long count, u_int flags)
|
||||
{
|
||||
struct resource *res = NULL;
|
||||
struct cbb_softc *sc = device_get_softc(brdev);
|
||||
@ -1800,7 +1800,7 @@ cbb_deactivate_resource(device_t brdev, device_t child, int type,
|
||||
|
||||
static struct resource *
|
||||
cbb_alloc_resource(device_t brdev, device_t child, int type, int *rid,
|
||||
u_long start, u_long end, u_long count, uint flags)
|
||||
u_long start, u_long end, u_long count, u_int flags)
|
||||
{
|
||||
struct cbb_softc *sc = device_get_softc(brdev);
|
||||
|
||||
|
@ -187,10 +187,10 @@ struct ppb_device {
|
||||
|
||||
const char *name; /* name of the device */
|
||||
|
||||
ushort mode; /* current mode of the device */
|
||||
ushort avm; /* available IEEE1284 modes of
|
||||
u_short mode; /* current mode of the device */
|
||||
u_short avm; /* available IEEE1284 modes of
|
||||
* the device */
|
||||
uint flags; /* flags */
|
||||
u_int flags; /* flags */
|
||||
|
||||
struct ppb_context ctx; /* context of the device */
|
||||
|
||||
|
@ -1012,7 +1012,7 @@ rc_hardclose(struct rc_chans *rc)
|
||||
|
||||
/* Reset the bastard */
|
||||
static void
|
||||
rc_hwreset(struct rc_softc *sc, uint chipid)
|
||||
rc_hwreset(struct rc_softc *sc, u_int chipid)
|
||||
{
|
||||
CCRCMD(sc, -1, CCR_HWRESET); /* Hardware reset */
|
||||
DELAY(20000);
|
||||
|
@ -718,7 +718,7 @@ camdump(sc)
|
||||
wbflush();
|
||||
|
||||
for (i = 0; i < 16; i++) {
|
||||
ushort ap2, ap1, ap0;
|
||||
u_short ap2, ap1, ap0;
|
||||
NIC_PUT(sc, SNCR_CEP, i);
|
||||
wbflush();
|
||||
ap2 = NIC_GET(sc, SNCR_CAP2);
|
||||
|
@ -620,8 +620,8 @@ cd9660_statfs(mp, sbp, td)
|
||||
*/
|
||||
|
||||
struct ifid {
|
||||
ushort ifid_len;
|
||||
ushort ifid_pad;
|
||||
u_short ifid_len;
|
||||
u_short ifid_pad;
|
||||
int ifid_ino;
|
||||
long ifid_start;
|
||||
};
|
||||
|
@ -647,8 +647,8 @@ udf_vget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp)
|
||||
}
|
||||
|
||||
struct ifid {
|
||||
ushort ifid_len;
|
||||
ushort ifid_pad;
|
||||
u_short ifid_len;
|
||||
u_short ifid_pad;
|
||||
int ifid_ino;
|
||||
long ifid_start;
|
||||
};
|
||||
|
@ -159,7 +159,7 @@ cpu_mp_probe()
|
||||
}
|
||||
|
||||
void
|
||||
cpu_mp_add(uint acpiid, uint apicid, uint apiceid)
|
||||
cpu_mp_add(u_int acpiid, u_int apicid, u_int apiceid)
|
||||
{
|
||||
struct pcpu *pc;
|
||||
u_int64_t lid;
|
||||
|
@ -120,7 +120,7 @@ int ia64_count_cpus(void);
|
||||
void map_gateway_page(void);
|
||||
void map_pal_code(void);
|
||||
void map_port_space(void);
|
||||
void cpu_mp_add(uint, uint, uint);
|
||||
void cpu_mp_add(u_int, u_int, u_int);
|
||||
|
||||
/*
|
||||
* Return contents of in-cpu fast counter as a sort of "bogo-time"
|
||||
|
@ -620,8 +620,8 @@ cd9660_statfs(mp, sbp, td)
|
||||
*/
|
||||
|
||||
struct ifid {
|
||||
ushort ifid_len;
|
||||
ushort ifid_pad;
|
||||
u_short ifid_len;
|
||||
u_short ifid_pad;
|
||||
int ifid_ino;
|
||||
long ifid_start;
|
||||
};
|
||||
|
@ -1165,7 +1165,7 @@ thread_update_usr_ticks(struct thread *td, int user)
|
||||
struct kse_upcall *ku;
|
||||
struct ksegrp *kg;
|
||||
caddr_t addr;
|
||||
uint uticks;
|
||||
u_int uticks;
|
||||
|
||||
if ((ku = td->td_upcall) == NULL)
|
||||
return (-1);
|
||||
|
@ -98,10 +98,10 @@ static STAILQ_HEAD(, ktr_request) ktr_free;
|
||||
|
||||
SYSCTL_NODE(_kern, OID_AUTO, ktrace, CTLFLAG_RD, 0, "KTRACE options");
|
||||
|
||||
static uint ktr_requestpool = KTRACE_REQUEST_POOL;
|
||||
static u_int ktr_requestpool = KTRACE_REQUEST_POOL;
|
||||
TUNABLE_INT("kern.ktrace.request_pool", &ktr_requestpool);
|
||||
|
||||
static uint ktr_geniosize = PAGE_SIZE;
|
||||
static u_int ktr_geniosize = PAGE_SIZE;
|
||||
TUNABLE_INT("kern.ktrace.genio_size", &ktr_geniosize);
|
||||
SYSCTL_UINT(_kern_ktrace, OID_AUTO, genio_size, CTLFLAG_RW, &ktr_geniosize,
|
||||
0, "Maximum size of genio event payload");
|
||||
@ -112,7 +112,7 @@ static struct sema ktrace_sema;
|
||||
|
||||
static void ktrace_init(void *dummy);
|
||||
static int sysctl_kern_ktrace_request_pool(SYSCTL_HANDLER_ARGS);
|
||||
static uint ktrace_resize_pool(uint newsize);
|
||||
static u_int ktrace_resize_pool(u_int newsize);
|
||||
static struct ktr_request *ktr_getrequest(int type);
|
||||
static void ktr_submitrequest(struct ktr_request *req);
|
||||
static void ktr_freerequest(struct ktr_request *req);
|
||||
@ -144,7 +144,7 @@ static int
|
||||
sysctl_kern_ktrace_request_pool(SYSCTL_HANDLER_ARGS)
|
||||
{
|
||||
struct thread *td;
|
||||
uint newsize, oldsize, wantsize;
|
||||
u_int newsize, oldsize, wantsize;
|
||||
int error;
|
||||
|
||||
/* Handle easy read-only case first to avoid warnings from GCC. */
|
||||
@ -152,10 +152,10 @@ sysctl_kern_ktrace_request_pool(SYSCTL_HANDLER_ARGS)
|
||||
mtx_lock(&ktrace_mtx);
|
||||
oldsize = ktr_requestpool;
|
||||
mtx_unlock(&ktrace_mtx);
|
||||
return (SYSCTL_OUT(req, &oldsize, sizeof(uint)));
|
||||
return (SYSCTL_OUT(req, &oldsize, sizeof(u_int)));
|
||||
}
|
||||
|
||||
error = SYSCTL_IN(req, &wantsize, sizeof(uint));
|
||||
error = SYSCTL_IN(req, &wantsize, sizeof(u_int));
|
||||
if (error)
|
||||
return (error);
|
||||
td = curthread;
|
||||
@ -165,7 +165,7 @@ sysctl_kern_ktrace_request_pool(SYSCTL_HANDLER_ARGS)
|
||||
newsize = ktrace_resize_pool(wantsize);
|
||||
mtx_unlock(&ktrace_mtx);
|
||||
td->td_pflags &= ~TDP_INKTRACE;
|
||||
error = SYSCTL_OUT(req, &oldsize, sizeof(uint));
|
||||
error = SYSCTL_OUT(req, &oldsize, sizeof(u_int));
|
||||
if (error)
|
||||
return (error);
|
||||
if (newsize != wantsize)
|
||||
@ -175,8 +175,8 @@ sysctl_kern_ktrace_request_pool(SYSCTL_HANDLER_ARGS)
|
||||
SYSCTL_PROC(_kern_ktrace, OID_AUTO, request_pool, CTLTYPE_UINT|CTLFLAG_RW,
|
||||
&ktr_requestpool, 0, sysctl_kern_ktrace_request_pool, "IU", "");
|
||||
|
||||
static uint
|
||||
ktrace_resize_pool(uint newsize)
|
||||
static u_int
|
||||
ktrace_resize_pool(u_int newsize)
|
||||
{
|
||||
struct ktr_request *req;
|
||||
|
||||
@ -786,7 +786,7 @@ ktr_writerequest(struct ktr_request *req)
|
||||
if (vp == NULL)
|
||||
return;
|
||||
kth = &req->ktr_header;
|
||||
datalen = data_lengths[(ushort)kth->ktr_type & ~KTR_DROP];
|
||||
datalen = data_lengths[(u_short)kth->ktr_type & ~KTR_DROP];
|
||||
buflen = kth->ktr_len;
|
||||
cred = req->ktr_cred;
|
||||
td = curthread;
|
||||
|
@ -1165,7 +1165,7 @@ thread_update_usr_ticks(struct thread *td, int user)
|
||||
struct kse_upcall *ku;
|
||||
struct ksegrp *kg;
|
||||
caddr_t addr;
|
||||
uint uticks;
|
||||
u_int uticks;
|
||||
|
||||
if ((ku = td->td_upcall) == NULL)
|
||||
return (-1);
|
||||
|
@ -402,8 +402,8 @@ shmat(td, uap)
|
||||
struct oshmid_ds {
|
||||
struct ipc_perm shm_perm; /* operation perms */
|
||||
int shm_segsz; /* size of segment (bytes) */
|
||||
ushort shm_cpid; /* pid, creator */
|
||||
ushort shm_lpid; /* pid, last operation */
|
||||
u_short shm_cpid; /* pid, creator */
|
||||
u_short shm_lpid; /* pid, last operation */
|
||||
short shm_nattch; /* no. of current attaches */
|
||||
time_t shm_atime; /* last attach time */
|
||||
time_t shm_dtime; /* last detach time */
|
||||
|
@ -3640,7 +3640,7 @@ vn_isdisk(vp, errp)
|
||||
void
|
||||
NDFREE(ndp, flags)
|
||||
struct nameidata *ndp;
|
||||
const uint flags;
|
||||
const u_int flags;
|
||||
{
|
||||
if (!(flags & NDF_NO_FREE_PNBUF) &&
|
||||
(ndp->ni_cnd.cn_flags & HASBUF)) {
|
||||
|
@ -365,7 +365,7 @@ in_pcbbind_setup(inp, nam, laddrp, lportp, td)
|
||||
if (*lportp != 0)
|
||||
lport = *lportp;
|
||||
if (lport == 0) {
|
||||
ushort first, last;
|
||||
u_short first, last;
|
||||
int count;
|
||||
|
||||
if (laddr.s_addr != INADDR_ANY)
|
||||
|
@ -172,7 +172,7 @@ NDINIT(struct nameidata *ndp,
|
||||
#define NDF_NO_FREE_PNBUF 0x00000020
|
||||
#define NDF_ONLY_PNBUF (~NDF_NO_FREE_PNBUF)
|
||||
|
||||
void NDFREE(struct nameidata *, const uint);
|
||||
void NDFREE(struct nameidata *, const u_int);
|
||||
|
||||
int namei(struct nameidata *ndp);
|
||||
int lookup(struct nameidata *ndp);
|
||||
|
@ -1239,7 +1239,7 @@ ffs_extwrite(struct vnode *vp, struct uio *uio, int ioflag, struct ucred *ucred)
|
||||
* the length of the EA, and possibly the pointer to the entry and to the data.
|
||||
*/
|
||||
static int
|
||||
ffs_findextattr(u_char *ptr, uint length, int nspace, const char *name, u_char **eap, u_char **eac)
|
||||
ffs_findextattr(u_char *ptr, u_int length, int nspace, const char *name, u_char **eap, u_char **eac)
|
||||
{
|
||||
u_char *p, *pe, *pn, *p0;
|
||||
int eapad1, eapad2, ealength, ealen, nlen;
|
||||
|
Loading…
Reference in New Issue
Block a user