silence more warnings

R=rsc
http://codereview.appspot.com/6744056
This commit is contained in:
Russ Cox 2012-10-21 12:04:56 -04:00
parent b0ae8a46a0
commit c5bfba483f
15 changed files with 279 additions and 271 deletions

View file

@ -497,7 +497,7 @@ void
xls(int argc, char **argv) xls(int argc, char **argv)
{ {
char *err, *name, *xname, *f[4], buf[4096]; char *err, *name, *xname, *f[4], buf[4096];
int nf, i, j, l, sort; int i, j, l, sort;
int lflag, dflag, tflag, n, len[4]; int lflag, dflag, tflag, n, len[4];
Dir *d; Dir *d;
CFid *fid; CFid *fid;
@ -569,7 +569,7 @@ xls(int argc, char **argv)
d[i].dev = 0; d[i].dev = 0;
snprint(buf, sizeof buf, "%d %s %s %lld", snprint(buf, sizeof buf, "%d %s %s %lld",
d[i].dev, d[i].uid, d[i].gid, d[i].length); d[i].dev, d[i].uid, d[i].gid, d[i].length);
nf = getfields(buf, f, 4, 0, " "); getfields(buf, f, 4, 0, " ");
for(j=0; j<4; j++){ for(j=0; j<4; j++){
l = strlen(f[j]); l = strlen(f[j]);
if(l > len[j]) if(l > len[j])

View file

@ -337,6 +337,7 @@ parsedefn(char *p, Type *t, char **pp)
oops(); oops();
sign = (*p == 's'); sign = (*p == 's');
p++; p++;
ischar = 0;
if(*p == 'c'){ if(*p == 'c'){
ischar = 1; ischar = 1;
p++; p++;
@ -353,6 +354,8 @@ parsedefn(char *p, Type *t, char **pp)
t->printfmt = 'd'; t->printfmt = 'd';
else else
t->printfmt = 'x'; t->printfmt = 'x';
USED(bits);
USED(ischar);
break; break;
case 'R': /* fp type */ case 'R': /* fp type */
n = parseint(&p); n = parseint(&p);

View file

@ -270,7 +270,7 @@ moon(void)
* planetary terms in parallax * planetary terms in parallax
*/ */
spterms = spterms; //spterms = spterms;
/* /*
* computation of longitude * computation of longitude

View file

@ -65,6 +65,7 @@ p9crclient(Conv *c)
res = nil; res = nil;
ret = -1; ret = -1;
attr = c->attr; attr = c->attr;
astype = -1;
if(c->proto == &p9cr){ if(c->proto == &p9cr){
astype = AuthChal; astype = AuthChal;
@ -131,6 +132,7 @@ p9crclient(Conv *c)
ret = 0; ret = 0;
out: out:
USED(astype);
keyclose(k); keyclose(k);
if(c->attr != attr) if(c->attr != attr)
freeattr(attr); freeattr(attr);

View file

@ -164,7 +164,6 @@ getdsakey(int argc, char **argv, int needprivate, Attr **pa)
char *file, *s, *p; char *file, *s, *p;
DSApriv *key; DSApriv *key;
Biobuf *b; Biobuf *b;
int regen;
Attr *a; Attr *a;
if(argc == 0) if(argc == 0)
@ -190,7 +189,6 @@ getdsakey(int argc, char **argv, int needprivate, Attr **pa)
return nil; return nil;
} }
regen = 0;
a = _parseattr(s+4); a = _parseattr(s+4);
if(a == nil){ if(a == nil){
werrstr("empty key"); werrstr("empty key");

View file

@ -973,6 +973,7 @@ runmsg(Aconn *a)
case SSH_AGENTC_RSA_CHALLENGE: case SSH_AGENTC_RSA_CHALLENGE:
n = get4(&m); n = get4(&m);
USED(n);
ek = getmp(&m); ek = getmp(&m);
mod = getmp(&m); mod = getmp(&m);
chal = getmp(&m); chal = getmp(&m);

View file

@ -87,12 +87,12 @@ extern void bz_internal_error ( int errcode );
#define AssertH(cond,errcode) \ #define AssertH(cond,errcode) \
{ if (!(cond)) bz_internal_error ( errcode ); } { if (!(cond)) bz_internal_error ( errcode ); }
#define AssertD(cond,msg) /* */ #define AssertD(cond,msg) /* */
#define VPrintf0(zf) /* */ #define VPrintf0(zf) USED(zf)
#define VPrintf1(zf,za1) /* */ #define VPrintf1(zf,za1) do { USED(zf); USED(za1); } while(0)
#define VPrintf2(zf,za1,za2) /* */ #define VPrintf2(zf,za1,za2) do { USED(zf); USED(za1); USED(za2); } while(0)
#define VPrintf3(zf,za1,za2,za3) /* */ #define VPrintf3(zf,za1,za2,za3) do { USED(zf); USED(za1); USED(za2); USED(za3); } while(0)
#define VPrintf4(zf,za1,za2,za3,za4) /* */ #define VPrintf4(zf,za1,za2,za3,za4) do { USED(zf); USED(za1); USED(za2); USED(za3); USED(za4); } while(0)
#define VPrintf5(zf,za1,za2,za3,za4,za5) /* */ #define VPrintf5(zf,za1,za2,za3,za4,za5) do { USED(zf); USED(za1); USED(za2); USED(za3); USED(za4); USED(za5); } while(0)
#define BZALLOC(nnn) (strm->bzalloc)(strm->opaque,(nnn),1) #define BZALLOC(nnn) (strm->bzalloc)(strm->opaque,(nnn),1)
#define BZFREE(ppp) (strm->bzfree)(strm->opaque,(ppp)) #define BZFREE(ppp) (strm->bzfree)(strm->opaque,(ppp))

View file

@ -171,6 +171,8 @@ readpsfontdesc(char *fontname, int trindex) {
startchar = RUNEGETCHAR(start); startchar = RUNEGETCHAR(start);
endfont = RUNEGETGROUP(end); endfont = RUNEGETGROUP(end);
endchar = RUNEGETCHAR(end); endchar = RUNEGETCHAR(end);
USED(startchar);
USED(endchar);
pfid = findpfn(psfontnam, 1); pfid = findpfn(psfontnam, 1);
if (startfont != endfont) { if (startfont != endfont) {
error(WARNING, "font descriptions must not cross 256 glyph block boundary\n"); error(WARNING, "font descriptions must not cross 256 glyph block boundary\n");

View file

@ -172,6 +172,7 @@ main(int argc, char *argv[])
default: default:
usage(); usage();
}ARGEND }ARGEND
USED(defmnt);
if(pipe(p) < 0) if(pipe(p) < 0)
error("pipe failed"); error("pipe failed");

View file

@ -8,8 +8,6 @@ textgen(void)
int i, sub, nstr, at, with, hset; int i, sub, nstr, at, with, hset;
double xwith, ywith, h, w, x0, y0, x1, y1; double xwith, ywith, h, w, x0, y0, x1, y1;
obj *p, *ppos; obj *p, *ppos;
static double prevh = 0;
static double prevw = 0;
Attr *ap; Attr *ap;
at = with = nstr = hset = 0; at = with = nstr = hset = 0;
@ -90,8 +88,6 @@ textgen(void)
cury = y1; cury = y1;
else else
cury = y0; cury = y0;
prevh = h;
prevw = w;
return(p); return(p);
} }

View file

@ -163,7 +163,7 @@ void n_setwd(void)
int delim, emsz, k; int delim, emsz, k;
int savhp, savapts, savapts1, savfont, savfont1, savpts, savpts1; int savhp, savapts, savapts1, savfont, savfont1, savpts, savpts1;
base = numtabp[ST].val = numtabp[ST].val = wid = numtabp[CT].val = 0; base = numtabp[ST].val = numtabp[SB].val = wid = numtabp[CT].val = 0;
if (ismot(i = getch())) if (ismot(i = getch()))
return; return;
delim = cbits(i); delim = cbits(i);

View file

@ -217,11 +217,15 @@ void xbits(Tchar i, int bitf)
Tchar t_setch(int c) Tchar t_setch(int c)
{ {
#ifndef UNICODE
int j; int j;
#endif
char temp[50]; char temp[50];
char *s; char *s;
#ifndef UNICODE
j = 0; j = 0;
#endif
s = temp; s = temp;
if (c == '(') { /* \(xx */ if (c == '(') { /* \(xx */
if ((*s++ = getach()) == 0 || (*s++ = getach()) == 0) if ((*s++ = getach()) == 0 || (*s++ = getach()) == 0)
@ -711,9 +715,8 @@ char *strdupl(const char *s) /* make a copy of s */
int int
setfp(int pos, int f, char *truename, int print) /* mount font f at position pos[0...nfonts] */ setfp(int pos, int f, char *truename, int print) /* mount font f at position pos[0...nfonts] */
{ {
char pathname[NS], shortname[NS], *sl; char pathname[NS], shortname[NS];
sl = (char*)0;
zapwcache(0); zapwcache(0);
if (truename) if (truename)
strcpy(shortname, truename); strcpy(shortname, truename);

View file

@ -682,6 +682,7 @@ vacstat(VacFile *parent, VacDir *vd, uchar *p, int np)
if(ext == nil) if(ext == nil)
return 0; return 0;
n = vacfileread(vf, ext, size, 0); n = vacfileread(vf, ext, size, 0);
USED(n);
ext[size] = 0; ext[size] = 0;
vacfiledecref(vf); vacfiledecref(vf);
if(vd->mode & ModeLink){ if(vd->mode & ModeLink){

View file

@ -4536,6 +4536,7 @@ validptr(void* p)
static char c; static char c;
c = *((char*)p); c = *((char*)p);
USED(c);
return 1; return 1;
} }

View file

@ -120,7 +120,7 @@ nfs3errstr(Nfs3Status status)
int i; int i;
for(i=0; i<nelem(etab); i++){ for(i=0; i<nelem(etab); i++){
if(etab[i].status == status){ if((int)etab[i].status == (int)status){
werrstr(etab[i].msg); werrstr(etab[i].msg);
return; return;
} }