o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more fixes

Browse source
This commit is contained in:
rsc 2007-04-21 20:49:30 +00:00
parent 946b8d7086
commit 6932098c9f
4 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/cmd/venti/srv/fixarenas.c
View file

@ -1357,6 +1357,7 @@ guessarena(vlong offset0, int anum, ArenaHead *head, Arena *arena,
* (the same pattern gets written many times in a row) * (the same pattern gets written many times in a row)
* and should never happen during regular use. * and should never happen during regular use.
*/ */
magic = 0;
if((n = isclump(p, &cl, &magic)) > 0){ if((n = isclump(p, &cl, &magic)) > 0){
/* /*
* If we were in the middle of some corrupted data, * If we were in the middle of some corrupted data,

9
src/cmd/venti/srv/httpd.c
View file

@ -168,11 +168,6 @@ httpproc(void *v)
if(hparsereq(c, 0) < 0) if(hparsereq(c, 0) < 0)
break; break;
if(c->req.search)
c->req.searchpairs = hparsequery(c, c->req.search);
else
c->req.searchpairs = nil;
for(i = 0; i < MaxObjs && objs[i].name[0]; i++){ for(i = 0; i < MaxObjs && objs[i].name[0]; i++){
n = strlen(objs[i].name); n = strlen(objs[i].name);
if((objs[i].name[n-1] == '/' && strncmp(c->req.uri, objs[i].name, n) == 0) if((objs[i].name[n-1] == '/' && strncmp(c->req.uri, objs[i].name, n) == 0)
@ -791,7 +786,7 @@ pctdiffgraph(Stats *s, Stats *t, void *va)
} }
static long static long
div(long a, long b) xdiv(long a, long b)
{ {
if(b == 0) if(b == 0)
b++; b++;
@ -804,7 +799,7 @@ divdiffgraph(Stats *s, Stats *t, void *va)
Arg *a; Arg *a;
a = va; a = va;
return div(t->n[a->index] - s->n[a->index], t->n[a->index2] - s->n[a->index2]); return xdiv(t->n[a->index] - s->n[a->index], t->n[a->index2] - s->n[a->index2]);
} }
static long static long

1
src/cmd/venti/srv/mirrorarenas.c
View file

@ -301,6 +301,7 @@ mirror(Arena *sa, Arena *da)
if(ewritepart(dst, base - blocksize, buf, blocksize) < 0) if(ewritepart(dst, base - blocksize, buf, blocksize) < 0)
return; return;
shaoff = 0;
ds = nil; ds = nil;
if(sa->diskstats.sealed && scorecmp(sa->score, zeroscore) != 0){ if(sa->diskstats.sealed && scorecmp(sa->score, zeroscore) != 0){
/* start sha1 state with header */ /* start sha1 state with header */

6
src/cmd/venti/srv/mkfile
View file

@ -40,7 +40,7 @@ LIBOFILES=\
SLIB=libvs.a SLIB=libvs.a
LIB=$SLIB $LIBDIR/libnventi.a LIB=$SLIB $LIBDIR/libventi.a
HFILES= dat.h\ HFILES= dat.h\
fns.h\ fns.h\
@ -73,9 +73,7 @@ it:V: $O.venti
CLEANFILES=$CLEANFILES $SLIB CLEANFILES=$CLEANFILES $SLIB
<$PLAN9/src/cmd/mkmany <$PLAN9/src/mkmany
CFLAGS=$CFLAGS -I.
$SLIB: $LIBOFILES $SLIB: $LIBOFILES
ar rvc $SLIB $LIBOFILES ar rvc $SLIB $LIBOFILES