From b830824cba80242e803e75816cf591f8ac32ca40 Mon Sep 17 00:00:00 2001 From: Alex Musolino Date: Thu, 13 Dec 2018 11:59:34 +1030 Subject: upas/fs: remove now unnecessary "force" argument to cachefree --- sys/src/cmd/upas/fs/cache.c | 8 +++----- sys/src/cmd/upas/fs/dat.h | 2 +- sys/src/cmd/upas/fs/mbox.c | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/src/cmd/upas/fs/cache.c b/sys/src/cmd/upas/fs/cache.c index 5382d08b0..34c4a2e86 100644 --- a/sys/src/cmd/upas/fs/cache.c +++ b/sys/src/cmd/upas/fs/cache.c @@ -32,13 +32,11 @@ notecache(Mailbox *mb, Message *m, long sz) } void -cachefree(Mailbox *mb, Message *m, int force) +cachefree(Mailbox *mb, Message *m) { long i; Message *s, **ll; - if(!force && mb->fetch == nil) - return; if(Topmsg(mb, m)){ for(ll = &mb->lru; *ll != nil; ll = &((*ll)->lru)){ if(*ll == m){ @@ -53,7 +51,7 @@ cachefree(Mailbox *mb, Message *m, int force) mb->cached -= m->csize; } for(s = m->part; s; s = s->next) - cachefree(mb, s, force); + cachefree(mb, s); if(m->mallocd){ free(m->start); m->mallocd = 0; @@ -100,7 +98,7 @@ putcache(Mailbox *mb, Message *m) return; addlru(mb, mb->lru); } - cachefree(mb, mb->lru, 1); + cachefree(mb, mb->lru); } } diff --git a/sys/src/cmd/upas/fs/dat.h b/sys/src/cmd/upas/fs/dat.h index 67f11bb98..d25656b0c 100644 --- a/sys/src/cmd/upas/fs/dat.h +++ b/sys/src/cmd/upas/fs/dat.h @@ -207,7 +207,7 @@ int insurecache(Mailbox*, Message*); /**/ void putcache(Mailbox*, Message*); /* asymmetricial */ -void cachefree(Mailbox*, Message*, int); +void cachefree(Mailbox*, Message*); char* syncmbox(Mailbox*, int); void* emalloc(ulong); diff --git a/sys/src/cmd/upas/fs/mbox.c b/sys/src/cmd/upas/fs/mbox.c index 044c4b091..b83014ec0 100644 --- a/sys/src/cmd/upas/fs/mbox.c +++ b/sys/src/cmd/upas/fs/mbox.c @@ -1041,7 +1041,7 @@ delmessage(Mailbox *mb, Message *m) if(Topmsg(mb, m)) mtreedelete(mb, m); - cachefree(mb, m, 1); + cachefree(mb, m); idxfree(m); } free(m->unixfrom); -- cgit v1.2.3