From: wessels <> Date: Tue, 3 Feb 1998 10:08:50 +0000 (+0000) Subject: storeRelease() can return void X-Git-Tag: SQUID_3_0_PRE1~4197 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c78a099345290154c2819b2e065f967d0c9718e;p=thirdparty%2Fsquid.git storeRelease() can return void --- diff --git a/src/protos.h b/src/protos.h index 53a6298d9d..3fa15e1e1f 100644 --- a/src/protos.h +++ b/src/protos.h @@ -401,7 +401,7 @@ extern void storeAbort(StoreEntry *, int); extern void storeAppend(StoreEntry *, const char *, int); extern void storeLockObject(StoreEntry *); extern void storeSwapInStart(StoreEntry *, SIH *, void *data); -extern int storeRelease(StoreEntry *); +extern void storeRelease(StoreEntry *); extern int storeUnlockObject(StoreEntry *); extern int storeUnregister(StoreEntry *, void *); extern void storeClientCopy(StoreEntry * e, diff --git a/src/store.cc b/src/store.cc index b28c5784bc..55eee6af81 100644 --- a/src/store.cc +++ b/src/store.cc @@ -1,6 +1,6 @@ /* - * $Id: store.cc,v 1.371 1998/02/03 01:17:08 wessels Exp $ + * $Id: store.cc,v 1.372 1998/02/03 03:08:51 wessels Exp $ * * DEBUG: section 20 Storeage Manager * AUTHOR: Harvest Derived @@ -753,7 +753,7 @@ storeMaintainSwapSpace(void *datanotused) /* release an object from a cache */ /* return number of objects released. */ -int +void storeRelease(StoreEntry * e) { debug(20, 3) ("storeRelease: Releasing: '%s'\n", storeKeyText(e->key)); @@ -763,7 +763,7 @@ storeRelease(StoreEntry * e) storeExpireNow(e); debug(20, 3) ("storeRelease: Only setting RELEASE_REQUEST bit\n"); storeReleaseRequest(e); - return 0; + return; } #if USE_ASYNC_IO aioCancel(-1, e); /* Make sure all forgotten async ops are cancelled */ @@ -777,7 +777,7 @@ storeRelease(StoreEntry * e) e->object_len = -(e->object_len); storeDirSwapLog(e); e->object_len = -(e->object_len); - return 0; + return; } #endif storeLog(STORE_LOG_RELEASE, e); @@ -799,7 +799,6 @@ storeRelease(StoreEntry * e) } storeSetMemStatus(e, NOT_IN_MEMORY); destroy_StoreEntry(e); - return 1; } /* return 1 if a store entry is locked */