From c6bdc0380b504f6df8ecc6e4666bbcf43b2780d0 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Fri, 4 Aug 1995 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1995-08-04 --- port/alarm.c | 4 +--- port/dev.c | 1 - port/devaudio.c | 26 ++++++-------------------- port/devboot.c | 12 ++++-------- port/devcons.c | 15 +++++---------- port/devdup.c | 23 +++++++---------------- port/devenv.c | 11 +++-------- port/devkprof.c | 14 ++++---------- port/devlance.c | 13 ++++--------- port/devmouse.c | 22 +++++++--------------- port/devns16552.c | 14 ++++---------- port/devpipe.c | 18 +++++------------- port/devproc.c | 9 +++------ port/devroot.c | 16 +++++----------- port/devsrv.c | 13 ++++--------- port/net.c | 3 +-- port/netif.c | 9 +++++++-- port/netif.h | 3 ++- port/page.c | 3 +-- port/print.c | 7 ++----- port/segment.c | 1 - port/swap.c | 4 +--- port/sysproc.c | 7 ++----- 23 files changed, 78 insertions(+), 170 deletions(-) diff --git a/port/alarm.c b/port/alarm.c index 98b752087afdf823e4dd4f06c1aee3ba0bfdc157..9f8efdca1b903abdd3e27feed5b058af34790ac5 100644 --- a/port/alarm.c +++ b/port/alarm.c @@ -9,13 +9,11 @@ Rendez alarmr; Talarm talarm; void -alarmkproc(void *arg) +alarmkproc(void*) { Proc *rp; ulong now; - USED(arg); - for(;;){ now = MACHP(0)->ticks; qlock(&alarms); diff --git a/port/dev.c b/port/dev.c index 6b821ceb35f68b34334853712815c0f77c1d9e65..77a7a6bd989982a34b9928e14d98f14e865db88f 100644 --- a/port/dev.c +++ b/port/dev.c @@ -67,7 +67,6 @@ devattach(int tc, char *spec) Chan *c; char buf[NAMELEN+4]; - USED(spec); c = newchan(); c->qid = (Qid){CHDIR, 0}; c->type = devno(tc, 0); diff --git a/port/devaudio.c b/port/devaudio.c index 827dfcd66b26a99d83154f1da886970f007b6898..5f43e3298aaa818b80e158233953e2afb72c4f72 100644 --- a/port/devaudio.c +++ b/port/devaudio.c @@ -420,9 +420,8 @@ audiosbintr(void) } void -pcaudiosbintr(Ureg *ureg, void *rock) +pcaudiosbintr(Ureg*, void*) { - USED(ureg, rock); /* print("sb16 audio interrupt\n"); /**/ audiosbintr(); } @@ -434,9 +433,8 @@ audiodmaintr(void) } static int -anybuf(void *p) +anybuf(void*) { - USED(p); return audio.intr; } @@ -664,13 +662,8 @@ audioopen(Chan *c, int omode) } void -audiocreate(Chan *c, char *name, int omode, ulong perm) +audiocreate(Chan*, char*, int, ulong) { - USED(c); - USED(name); - USED(omode); - USED(perm); - error(Eperm); } @@ -806,15 +799,13 @@ audiobread(Chan *c, long n, ulong offset) } long -audiowrite(Chan *c, char *a, long n, ulong offset) +audiowrite(Chan *c, char *a, long n, ulong) { long m, n0; int i, nf, v, left, right, in, out; char buf[255], *field[Ncmd]; Buf *b; - USED(offset); - n0 = n; switch(c->qid.path & ~CHDIR) { default: @@ -941,19 +932,14 @@ audiobwrite(Chan *c, Block *bp, ulong offset) } void -audioremove(Chan *c) +audioremove(Chan*) { - USED(c); - error(Eperm); } void -audiowstat(Chan *c, char *dp) +audiowstat(Chan*, char*) { - USED(c); - USED(dp); - error(Eperm); } diff --git a/port/devboot.c b/port/devboot.c index 3d64483a7cd00c95ca6d99e582e7c706cbe999c1..ef1ad4f674674f953f268474d18320ea8987724e 100644 --- a/port/devboot.c +++ b/port/devboot.c @@ -60,16 +60,14 @@ bootopen(Chan *c, int omode) } void -bootcreate(Chan *c, char *name, int omode, ulong perm) +bootcreate(Chan*, char*, int, ulong) { - USED(c, name, omode, perm); error(Eperm); } void -bootclose(Chan *c) +bootclose(Chan*) { - USED(c); } long @@ -133,15 +131,13 @@ bootbwrite(Chan *c, Block *bp, ulong offset) } void -bootremove(Chan *c) +bootremove(Chan*) { - USED(c); error(Eperm); } void -bootwstat(Chan *c, char *dp) +bootwstat(Chan*, char*) { - USED(c, dp); error(Eperm); } diff --git a/port/devcons.c b/port/devcons.c index 84aa886277eae26f3fe5a1e7f1d32d59ee1115fb..decd8ac53385d4da350277641395a149dae03f06 100644 --- a/port/devcons.c +++ b/port/devcons.c @@ -119,12 +119,11 @@ print(char *fmt, ...) } int -fprint(int fd, char *fmt, ...) /* needed so we can use user-level libg */ +fprint(int, char *fmt, ...) /* needed so we can use user-level libg */ { char buf[PRINTSIZE]; int n; - USED(fd); n = doprint(buf, buf+sizeof(buf), fmt, (&fmt+1)) - buf; putstrn(buf, n); @@ -266,13 +265,12 @@ kbdcr2nl(Queue *q, int ch) * Called at interrupt time to process a character. */ int -kbdputc(Queue *q, int ch) +kbdputc(Queue*, int ch) { int n; char buf[3]; Rune r; - USED(q); r = ch; n = runetochar(buf, &r); if(n == 0) @@ -455,9 +453,8 @@ consopen(Chan *c, int omode) } void -conscreate(Chan *c, char *name, int omode, ulong perm) +conscreate(Chan*, char*, int, ulong) { - USED(c, name, omode, perm); error(Eperm); } @@ -853,16 +850,14 @@ consbwrite(Chan *c, Block *bp, ulong offset) } void -consremove(Chan *c) +consremove(Chan*) { - USED(c); error(Eperm); } void -conswstat(Chan *c, char *dp) +conswstat(Chan*, char*) { - USED(c, dp); error(Eperm); } diff --git a/port/devdup.c b/port/devdup.c index c7a1eda019fb64651280d91adc9e7b2052c8d208..dd113cd08e8d1d37b4d80cdefa044f14a77e9f49 100644 --- a/port/devdup.c +++ b/port/devdup.c @@ -9,15 +9,13 @@ int -dupgen(Chan *c, Dirtab *tab, int ntab, int s, Dir *dp) +dupgen(Chan *c, Dirtab*, int, int s, Dir *dp) { char buf[8]; Fgrp *fgrp = up->fgrp; Chan *f; static int perm[] = { 0400, 0200, 0600, 0 }; - USED(tab); - USED(ntab); if(s >= NFD) return -1; if((f=fgrp->fd[s]) == 0) @@ -84,39 +82,33 @@ dupopen(Chan *c, int omode) } void -dupcreate(Chan *c, char *name, int omode, ulong perm) +dupcreate(Chan*, char*, int, ulong) { - USED(c, name, omode, perm); error(Eperm); } void -dupremove(Chan *c) +dupremove(Chan*) { - USED(c); error(Eperm); } void -dupwstat(Chan *c, char *dp) +dupwstat(Chan*, char*) { - USED(c); - USED(dp); error(Egreg); } void -dupclose(Chan *c) +dupclose(Chan*) { - USED(c); } long -dupread(Chan *c, void *va, long n, ulong offset) +dupread(Chan *c, void *va, long n, ulong) { char *a = va; - USED(offset); if(c->qid.path != CHDIR) panic("dupread"); return devdirread(c, a, n, (Dirtab *)0, 0L, dupgen); @@ -129,9 +121,8 @@ dupbread(Chan *c, long n, ulong offset) } long -dupwrite(Chan *c, void *va, long n, ulong offset) +dupwrite(Chan*, void*, long, ulong) { - USED(c, va, n, offset); panic("dupwrite"); return 0; /* not reached */ } diff --git a/port/devenv.c b/port/devenv.c index 077421bce3312ef7631b9a6760632cb7d3ba9525..d87ede092a8d7624db8175fd991ac7b90780c620 100644 --- a/port/devenv.c +++ b/port/devenv.c @@ -23,14 +23,11 @@ envinit(void) } int -envgen(Chan *c, Dirtab *tab, int ntab, int s, Dir *dp) +envgen(Chan *c, Dirtab*, int, int s, Dir *dp) { Egrp *eg; Evalue *e; - USED(tab); - USED(ntab); - eg = up->egrp; qlock(eg); @@ -177,16 +174,14 @@ envremove(Chan *c) } void -envwstat(Chan *c, char *db) +envwstat(Chan*, char*) { - USED(c, db); error(Eperm); } void -envclose(Chan * c) +envclose(Chan*) { - USED(c); } long diff --git a/port/devkprof.c b/port/devkprof.c index a9340e296c61844d244ff68f2b7da6ad22f3d03a..f2ec3759b2bbfff79ab96721e391b5c9d89be629 100644 --- a/port/devkprof.c +++ b/port/devkprof.c @@ -95,30 +95,26 @@ kprofopen(Chan *c, int omode) } void -kprofcreate(Chan *c, char *name, int omode, ulong perm) +kprofcreate(Chan*, char*, int, ulong) { - USED(c, name, omode, perm); error(Eperm); } void -kprofremove(Chan *c) +kprofremove(Chan*) { - USED(c); error(Eperm); } void -kprofwstat(Chan *c, char *dp) +kprofwstat(Chan*, char*) { - USED(c, dp); error(Eperm); } void kprofclose(Chan *c) { - USED(c); } long @@ -169,10 +165,8 @@ kprofbread(Chan *c, long n, ulong offset) } long -kprofwrite(Chan *c, char *a, long n, ulong offset) +kprofwrite(Chan *c, char *a, long n, ulong) { - USED(offset); - switch((int)(c->qid.path&~CHDIR)){ case Kprofctlqid: if(strncmp(a, "startclr", 8) == 0){ diff --git a/port/devlance.c b/port/devlance.c index e01ae84ebc7e6129bd812ef66dc5e832b66d02b3..04254982c7ca94f3aeb12113ccc7ceba1c74c10b 100644 --- a/port/devlance.c +++ b/port/devlance.c @@ -366,9 +366,8 @@ lanceintr(void) * turn promiscuous mode on/off */ static void -promiscuous(void *arg, int on) +promiscuous(void*, int on) { - USED(arg); if(on) lancestart(PROM); else @@ -408,9 +407,8 @@ lanceopen(Chan *c, int omode) } void -lancecreate(Chan *c, char *name, int omode, ulong perm) +lancecreate(Chan*, char*, int, ulong) { - USED(c, name, omode, perm); } void @@ -465,13 +463,11 @@ etherloop(Etherpkt *p, long n) } long -lancewrite(Chan *c, void *buf, long n, ulong offset) +lancewrite(Chan *c, void *buf, long n, ulong) { Msg *m; Lancepkt *p; - USED(offset); - if(n > ETHERMAXTU) error(Ebadarg); @@ -522,9 +518,8 @@ lancebwrite(Chan *c, Block *bp, ulong offset) } void -lanceremove(Chan *c) +lanceremove(Chan*) { - USED(c); } void diff --git a/port/devmouse.c b/port/devmouse.c index e3f805b7e30f0408e12f288e6aa1dacc7aa2bdb2..4ac7d72c556239c98095bb0e9d966efaf292000c 100644 --- a/port/devmouse.c +++ b/port/devmouse.c @@ -146,25 +146,22 @@ mouseopen(Chan *c, int omode) } void -mousecreate(Chan *c, char *name, int omode, ulong perm) +mousecreate(Chan*, char*, int, ulong) { if(!conf.monitor) error(Egreg); - USED(c, name, omode, perm); error(Eperm); } void -mouseremove(Chan *c) +mouseremove(Chan*) { - USED(c); error(Eperm); } void -mousewstat(Chan *c, char *db) +mousewstat(Chan*, char*) { - USED(c, db); error(Eperm); } @@ -237,13 +234,12 @@ mousebread(Chan *c, long n, ulong offset) } long -mousewrite(Chan *c, void *va, long n, ulong offset) +mousewrite(Chan *c, void *va, long n, ulong) { char *p; Point pt; char buf[64]; - USED(offset); p = va; switch(c->qid.path){ case CHDIR: @@ -377,7 +373,7 @@ mousetrack(int b, int dx, int dy) * shift & right button is the same as middle button (for 2 button mice) */ int -m3mouseputc(void *q, int c) +m3mouseputc(void*, int c) { static uchar msg[3]; static int nb; @@ -386,8 +382,6 @@ m3mouseputc(void *q, int c) short x; int dx, dy, newbuttons; - USED(q); - /* * check bit 6 for consistency */ @@ -419,14 +413,13 @@ m3mouseputc(void *q, int c) * shift & right button is the same as middle button (for 2 button mice) */ int -mouseputc(void *q, int c) +mouseputc(void*, int c) { static short msg[5]; static int nb; static uchar b[] = {0, 4, 2, 6, 1, 5, 3, 7, 0, 2, 2, 6, 1, 5, 3, 7}; int dx, dy, newbuttons; - USED(q); if((c&0xF0) == 0x80) nb=0; msg[nb] = c; @@ -443,9 +436,8 @@ mouseputc(void *q, int c) } int -mousechanged(void *m) +mousechanged(void*) { - USED(m); return mouse.lastcounter - mouse.counter; } diff --git a/port/devns16552.c b/port/devns16552.c index f2d2e8aa85a738c647e47097b189a7afdd023d25..d38e6c21a500d6eeb4b379d0a1beba14d2248902 100644 --- a/port/devns16552.c +++ b/port/devns16552.c @@ -762,9 +762,8 @@ ns16552open(Chan *c, int omode) } void -ns16552create(Chan *c, char *name, int omode, ulong perm) +ns16552create(Chan*, char*, int, ulong) { - USED(c, name, omode, perm); error(Eperm); } @@ -794,14 +793,12 @@ ns16552close(Chan *c) } static long -uartstatus(Chan *c, Uart *p, void *buf, long n, long offset) +uartstatus(Chan*, Uart *p, void *buf, long n, long offset) { uchar mstat; uchar tstat; char str[256]; - USED(c); - str[0] = 0; tstat = p->sticky[Mctl]; mstat = uartrdreg(p, Mstat); @@ -933,13 +930,11 @@ ns16552ctl(Uart *p, char *cmd) } long -ns16552write(Chan *c, void *buf, long n, ulong offset) +ns16552write(Chan *c, void *buf, long n, ulong) { Uart *p; char cmd[32]; - USED(offset); - if(c->qid.path & CHDIR) error(Eperm); @@ -972,9 +967,8 @@ ns16552bwrite(Chan *c, Block *bp, ulong offset) } void -ns16552remove(Chan *c) +ns16552remove(Chan*) { - USED(c); error(Eperm); } diff --git a/port/devpipe.c b/port/devpipe.c index 5ba9b7e0d941d82fabfbd22a6b9dba15ad6645a8..9785769a37fc82f9ecbddf4f649d7ef0908d01eb 100644 --- a/port/devpipe.c +++ b/port/devpipe.c @@ -209,9 +209,8 @@ piperemove(Chan*) } void -pipewstat(Chan *c, char *db) +pipewstat(Chan*, char*) { - USED(c, db); error(Eperm); } @@ -268,12 +267,10 @@ pipeclose(Chan *c) } long -piperead(Chan *c, void *va, long n, ulong offset) +piperead(Chan *c, void *va, long n, ulong) { Pipe *p; - USED(offset); - p = c->aux; switch(NETTYPE(c->qid.path)){ @@ -294,8 +291,6 @@ pipebread(Chan *c, long n, ulong offset) { Pipe *p; - USED(offset); - p = c->aux; switch(NETTYPE(c->qid.path)){ @@ -313,12 +308,10 @@ pipebread(Chan *c, long n, ulong offset) * the process. */ long -pipewrite(Chan *c, void *va, long n, ulong offset) +pipewrite(Chan *c, void *va, long n, ulong) { Pipe *p; - USED(offset); - if((getstatus()&IE) == 0) print("pipewrite hi %lux\n", getcallerpc(c)); if(waserror()) { @@ -348,13 +341,11 @@ pipewrite(Chan *c, void *va, long n, ulong offset) } long -pipebwrite(Chan *c, Block *bp, ulong offset) +pipebwrite(Chan *c, Block *bp, ulong) { long n; Pipe *p; - USED(offset); - if(waserror()) { /* avoid notes when pipe is a mounted queue */ if((c->flag & CMSG) == 0) @@ -373,6 +364,7 @@ pipebwrite(Chan *c, Block *bp, ulong offset) break; default: + n = 0; panic("pipebwrite"); } diff --git a/port/devproc.c b/port/devproc.c index 5d5574ecc55bc9232ab3445522e4fcafde8e6d66..e5e454c7d18568418eeacaa6bb657119a58d2ed0 100644 --- a/port/devproc.c +++ b/port/devproc.c @@ -73,14 +73,13 @@ int procstopped(void*); void mntscan(Mntwalk*); int -procgen(Chan *c, Dirtab *tab, int ntab, int s, Dir *dp) +procgen(Chan *c, Dirtab *tab, int, int s, Dir *dp) { Qid qid; Proc *p; char buf[NAMELEN]; ulong pid, path, perm, len; - USED(ntab); if(c->qid.path == CHDIR){ if(s >= conf.nproc) return -1; @@ -224,16 +223,14 @@ procopen(Chan *c, int omode) } void -proccreate(Chan *c, char *name, int omode, ulong perm) +proccreate(Chan*, char*, int, ulong) { - USED(c, name, omode, perm); error(Eperm); } void -procremove(Chan *c) +procremove(Chan*) { - USED(c); error(Eperm); } diff --git a/port/devroot.c b/port/devroot.c index ad3331649e45b24e241f10bcf1d865fdfd5aa947..03e3356c2fdb12dd5c16972986d721445613f1e6 100644 --- a/port/devroot.c +++ b/port/devroot.c @@ -131,9 +131,8 @@ rootopen(Chan *c, int omode) } void -rootcreate(Chan *c, char *name, int omode, ulong perm) +rootcreate(Chan*, char*, int, ulong) { - USED(c, name, omode, perm); error(Eperm); } @@ -143,7 +142,6 @@ rootcreate(Chan *c, char *name, int omode, ulong perm) void rootclose(Chan *c) { - USED(c); switch(c->qid.path) { default: break; @@ -155,9 +153,8 @@ rootclose(Chan *c) } int -rdrdy(void *a) +rdrdy(void*) { - USED(a); return reclist.q != 0; } @@ -218,11 +215,10 @@ rootbread(Chan *c, long n, ulong offset) } long -rootwrite(Chan *c, void *buf, long n, ulong offset) +rootwrite(Chan *c, void *buf, long n, ulong) { char tmp[256]; - USED(offset); switch(c->qid.path & ~CHDIR){ default: error(Egreg); @@ -245,16 +241,14 @@ rootbwrite(Chan *c, Block *bp, ulong offset) } void -rootremove(Chan *c) +rootremove(Chan*) { - USED(c); error(Eperm); } void -rootwstat(Chan *c, char *dp) +rootwstat(Chan*, char*) { - USED(c, dp); error(Eperm); } diff --git a/port/devsrv.c b/port/devsrv.c index 14b17383bdf8ac40d5648cad60b712e1bfa8e126..70c1b3d965406ada275fc2cd545a7e33b871c650 100644 --- a/port/devsrv.c +++ b/port/devsrv.c @@ -23,12 +23,10 @@ static Srv *srv; static int qidpath; int -srvgen(Chan *c, Dirtab *tab, int ntab, int s, Dir *dp) +srvgen(Chan *c, Dirtab*, int, int s, Dir *dp) { Srv *sp; - USED(tab); - USED(ntab); qlock(&srvlk); for(sp = srv; sp && s; sp = sp->link) s--; @@ -213,15 +211,13 @@ srvwstat(Chan *c, char *dp) } void -srvclose(Chan *c) +srvclose(Chan*) { - USED(c); } long -srvread(Chan *c, void *va, long n, ulong offset) +srvread(Chan *c, void *va, long n, ulong) { - USED(offset); isdir(c); return devdirread(c, va, n, 0, 0, srvgen); } @@ -233,14 +229,13 @@ srvbread(Chan *c, long n, ulong offset) } long -srvwrite(Chan *c, void *va, long n, ulong offset) +srvwrite(Chan *c, void *va, long n, ulong) { Srv *sp; Chan *c1; int fd; char buf[32]; - USED(offset); if(n >= sizeof buf) error(Egreg); memmove(buf, va, n); /* so we can NUL-terminate */ diff --git a/port/net.c b/port/net.c index b9efca8bed46f9515b3180c0f57d59add5df3ddb..43ee1a20a6dc73847eac279970b781887601ee76 100644 --- a/port/net.c +++ b/port/net.c @@ -32,7 +32,7 @@ findprot(Network *np, int id) * generate a 3 level directory */ int -netgen(Chan *c, void *vp, int ntab, int i, Dir *dp) +netgen(Chan *c, void *vp, int, int i, Dir *dp) { Qid q; char buf[32]; @@ -42,7 +42,6 @@ netgen(Chan *c, void *vp, int ntab, int i, Dir *dp) int perm; char *o; - USED(ntab); q.vers = 0; /* top level directory contains the name of the network */ diff --git a/port/netif.c b/port/netif.c index ad580dc9ce9f6d206338fbd588e7b7d1f90421cf..c520f6823e57c054352e2f5cb2cd4cb345c4b0db 100644 --- a/port/netif.c +++ b/port/netif.c @@ -30,7 +30,7 @@ netifinit(Netif *nif, char *name, int nfile, ulong limit) * generate a 3 level directory */ static int -netifgen(Chan *c, void *vp, int ntab, int i, Dir *dp) +netifgen(Chan *c, void *vp, int, int i, Dir *dp) { Qid q; char buf[32]; @@ -40,7 +40,6 @@ netifgen(Chan *c, void *vp, int ntab, int i, Dir *dp) int perm; char *o; - USED(ntab); q.vers = 0; /* top level directory contains the name of the network */ @@ -102,6 +101,10 @@ netifgen(Chan *c, void *vp, int ntab, int i, Dir *dp) q.path = NETQID(NETID(c->qid.path), Ntypeqid); devdir(c, q, "type", 0, eve, 0444, dp); break; + case 4: + q.path = NETQID(NETID(c->qid.path), Nifstatqid); + devdir(c, q, "ifstats", 0, eve, 0444, dp); + break; default: return -1; } @@ -187,6 +190,8 @@ netifread(Netif *nif, Chan *c, void *a, long n, ulong offset) case Ntypeqid: f = nif->f[NETID(c->qid.path)]; return readnum(offset, a, n, f->type, NUMSIZE); + case Nifstatqid: + return 0; } error(Ebadarg); return -1; /* not reached */ diff --git a/port/netif.h b/port/netif.h index 12260064bd7b503509930a3e660cbed88298721c..2cc4d778e40dfaa23f7389761d6f07532f2cd4f9 100644 --- a/port/netif.h +++ b/port/netif.h @@ -13,6 +13,7 @@ enum Nctlqid, Nstatqid, Ntypeqid, + Nifstatqid, }; /* @@ -65,7 +66,7 @@ struct Netif int inpackets; int outpackets; int crcs; /* input crc errors */ - int oerrs; /* output erros */ + int oerrs; /* output errors */ int frames; /* framing errors */ int overflows; /* packet overflows */ int buffs; /* buffering errors */ diff --git a/port/page.c b/port/page.c index bf06b6f9e609bdb15ee18b28cdbfda8053716c5a..a036a158c553dcf14bae50c4cdbd4a2f4fae25ef 100644 --- a/port/page.c +++ b/port/page.c @@ -165,9 +165,8 @@ retry: } int -ispages(void *p) +ispages(void*) { - USED(p); return palloc.freecount >= swapalloc.highwater; } diff --git a/port/print.c b/port/print.c index f5dc7a757e6f73bc28c560e68320fd955109e668..dbb39da54d1d07087e3138d984a23fb95b76ed8f 100644 --- a/port/print.c +++ b/port/print.c @@ -525,10 +525,9 @@ sconv(void *o, Fconv *fp) static int -percent(void *o, Fconv *fp) +percent(void*, Fconv *fp) { - USED(o); if(fp->out < fp->eout) *fp->out++ = '%'; return 0; @@ -536,12 +535,10 @@ percent(void *o, Fconv *fp) static int -flags(void *o, Fconv *fp) +flags(void*, Fconv *fp) { int f; - USED(o); - f = 0; switch(fp->chr) { case '+': diff --git a/port/segment.c b/port/segment.c index df3c8ccf08f0e6db39233a3a0735fe9b0626d0e3..71aa31fd9a04acf80dd5bee0bbc2498eef9e9fa2 100644 --- a/port/segment.c +++ b/port/segment.c @@ -431,7 +431,6 @@ segattach(Proc *p, ulong attr, char *name, ulong va, ulong len) Segment *s; Physseg *ps; - USED(p); if(va != 0 && (va&KZERO) == KZERO) /* BUG: Only ok for now */ error(Ebadarg); diff --git a/port/swap.c b/port/swap.c index 2f3d5935ac7ad0558f890ecc518bee106c24704c..210d2b7e2fa4331bc0f34271f7f4fc2a47e40a17 100644 --- a/port/swap.c +++ b/port/swap.c @@ -103,7 +103,6 @@ pager(void *junk) if(waserror()) panic("pager: os error\n"); - USED(junk); p = proctab(0); ep = &p[conf.nproc]; @@ -321,9 +320,8 @@ executeio(void) } int -needpages(void *p) +needpages(void*) { - USED(p); return palloc.freecount < swapalloc.headroom; } diff --git a/port/sysproc.c b/port/sysproc.c index 838ebc3299bedfc908dd6e874f6944b6c846bf0b..d409ea54a3de0fb786019f909e8acc3f69752e27 100644 --- a/port/sysproc.c +++ b/port/sysproc.c @@ -452,9 +452,8 @@ shargs(char *s, int n, char **ap) } int -return0(void *a) +return0(void*) { - USED(a); return 0; } @@ -519,9 +518,8 @@ syswait(ulong *arg) } long -sysdeath(ulong *arg) +sysdeath(ulong*) { - USED(arg); pprint("deprecated system call\n"); pexit("Suicide", 0); return 0; /* not reached */ @@ -543,7 +541,6 @@ syserrstr(ulong *arg) long sysnotify(ulong *arg) { - USED(arg); if(arg[0] != 0) validaddr(arg[0], sizeof(ulong), 0); up->notify = (int(*)(void*, char*))(arg[0]);