aboutsummaryrefslogtreecommitdiff
path: root/src/cmd
diff options
context:
space:
mode:
authorrsc <devnull@localhost>2005-08-11 17:33:43 +0000
committerrsc <devnull@localhost>2005-08-11 17:33:43 +0000
commitbcac59d81b63c352a9073104e7e63838e117a877 (patch)
treef8a3ffb635c9d2209d42baf19c85c73eaa2d90db /src/cmd
parent01d1f4cb4b791eca0bc79bc00188bf3c688290e6 (diff)
downloadplan9port-bcac59d81b63c352a9073104e7e63838e117a877.tar.gz
plan9port-bcac59d81b63c352a9073104e7e63838e117a877.tar.bz2
plan9port-bcac59d81b63c352a9073104e7e63838e117a877.zip
silence various warnings
Diffstat (limited to 'src/cmd')
-rw-r--r--src/cmd/9p.c6
-rw-r--r--src/cmd/auth/factotum/conv.c2
-rw-r--r--src/cmd/auth/factotum/fs.c2
-rw-r--r--src/cmd/lex/ncform2
-rw-r--r--src/cmd/listen1.c1
-rw-r--r--src/cmd/proof/screen.c1
-rw-r--r--src/cmd/spell/sprog.c1
-rw-r--r--src/cmd/venti/srv/dat.h12
8 files changed, 11 insertions, 16 deletions
diff --git a/src/cmd/9p.c b/src/cmd/9p.c
index bace6d09..99033bc8 100644
--- a/src/cmd/9p.c
+++ b/src/cmd/9p.c
@@ -336,10 +336,8 @@ timefmt(Fmt *fmt)
if((long)(time0-u) < 6*30*86400)
return fmtprint(fmt, "%s %2d %02d:%02d",
mon[tm->mon], tm->mday, tm->hour, tm->min);
- else
- return fmtprint(fmt, "%s %2d %5d",
- mon[tm->mon], tm->mday, tm->year+1900);
- return 0;
+ return fmtprint(fmt, "%s %2d %5d",
+ mon[tm->mon], tm->mday, tm->year+1900);
}
static int
diff --git a/src/cmd/auth/factotum/conv.c b/src/cmd/auth/factotum/conv.c
index a39abff5..cd9d5045 100644
--- a/src/cmd/auth/factotum/conv.c
+++ b/src/cmd/auth/factotum/conv.c
@@ -105,7 +105,7 @@ convgetrpc(Conv *c, int want)
return &c->rpc;
rpcrespond(c, "phase in state '%s' want '%s'", c->state, rpcname[want]);
}
- return nil; /* not reached */
+ /* not reached */
}
/* read until the done function tells us that's enough */
diff --git a/src/cmd/auth/factotum/fs.c b/src/cmd/auth/factotum/fs.c
index 698d3305..5e3a64e6 100644
--- a/src/cmd/auth/factotum/fs.c
+++ b/src/cmd/auth/factotum/fs.c
@@ -159,7 +159,7 @@ readlist(int off, int (*gen)(int, char*, uint), Req *r)
a += n;
off++;
}
- return -1; /* not reached */
+ /* not reached */
}
static int
diff --git a/src/cmd/lex/ncform b/src/cmd/lex/ncform
index 6571735b..64740ae7 100644
--- a/src/cmd/lex/ncform
+++ b/src/cmd/lex/ncform
@@ -157,7 +157,7 @@ yylook(void){
if(debug)putchar('\n');
# endif
}
- return(0); /* shut up the compiler; i have no idea what should be returned */
+ /* not reached */
}
int
yyback(int *p, int m)
diff --git a/src/cmd/listen1.c b/src/cmd/listen1.c
index 0f9762ff..a9e1a0ae 100644
--- a/src/cmd/listen1.c
+++ b/src/cmd/listen1.c
@@ -102,5 +102,4 @@ main(int argc, char **argv)
break;
}
}
- exits(nil);
}
diff --git a/src/cmd/proof/screen.c b/src/cmd/proof/screen.c
index dccfe01d..a9a7ef1f 100644
--- a/src/cmd/proof/screen.c
+++ b/src/cmd/proof/screen.c
@@ -88,7 +88,6 @@ getcmdstr(void)
}
}
}
- return nil;
}
static char *
diff --git a/src/cmd/spell/sprog.c b/src/cmd/spell/sprog.c
index 971848e1..0fe6794c 100644
--- a/src/cmd/spell/sprog.c
+++ b/src/cmd/spell/sprog.c
@@ -591,7 +591,6 @@ main(int argc, char *argv[])
} else if(affix[0] != 0 && affix[0] != '.')
print("%s\t%s\n", affix, original);
}
- exits(0);
}
/* strip exactly one suffix and do
diff --git a/src/cmd/venti/srv/dat.h b/src/cmd/venti/srv/dat.h
index 5f6d1a3f..37c3a05b 100644
--- a/src/cmd/venti/srv/dat.h
+++ b/src/cmd/venti/srv/dat.h
@@ -75,17 +75,17 @@ enum
/*
* magic numbers on disk
*/
- _ClumpMagic = 0xd15cb10c, /* clump header, deprecated */
+ _ClumpMagic = 0xd15cb10cU, /* clump header, deprecated */
ClumpFreeMagic = 0, /* free clump; terminates active clump log */
- ArenaPartMagic = 0xa9e4a5e7, /* arena partition header */
- ArenaMagic = 0xf2a14ead, /* arena trailer */
- ArenaHeadMagic = 0xd15c4ead, /* arena header */
+ ArenaPartMagic = 0xa9e4a5e7U, /* arena partition header */
+ ArenaMagic = 0xf2a14eadU, /* arena trailer */
+ ArenaHeadMagic = 0xd15c4eadU, /* arena header */
- BloomMagic = 0xb1004ead, /* bloom filter header */
+ BloomMagic = 0xb1004eadU, /* bloom filter header */
BloomMaxHash = 32,
- ISectMagic = 0xd15c5ec7, /* index header */
+ ISectMagic = 0xd15c5ec7U, /* index header */
ArenaPartVersion = 3,
ArenaVersion4 = 4,