From: wessels <> Date: Thu, 19 Apr 2007 05:38:04 +0000 (+0000) Subject: Converted contentLen() to a StoreEntry class method. X-Git-Tag: SQUID_3_0_PRE6~72 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6056fb29c083601851c79c77d3b966a0564f66d6;p=thirdparty%2Fsquid.git Converted contentLen() to a StoreEntry class method. --- diff --git a/src/fs/coss/store_io_coss.cc b/src/fs/coss/store_io_coss.cc index 2eb0e8f982..ba51e5f474 100644 --- a/src/fs/coss/store_io_coss.cc +++ b/src/fs/coss/store_io_coss.cc @@ -1,6 +1,6 @@ /* - * $Id: store_io_coss.cc,v 1.29 2006/05/23 00:39:32 wessels Exp $ + * $Id: store_io_coss.cc,v 1.30 2007/04/18 23:38:04 wessels Exp $ * * DEBUG: section 79 Storage Manager COSS Interface * AUTHOR: Eric Stern @@ -80,7 +80,7 @@ CossSwapDir::allocate(const StoreEntry * e, int which) if (e->swap_file_sz > 0) allocsize = e->swap_file_sz; else - allocsize = objectLen(e) + e->mem_obj->swap_hdr_sz; + allocsize = e->objectLen() + e->mem_obj->swap_hdr_sz; /* Check if we have overflowed the disk .. */ /* max_size is int, so cast to (off_t) *before* bit-shifting */ @@ -160,7 +160,7 @@ CossSwapDir::createStoreIO(StoreEntry &e, StoreIOState::STFNCB * file_callback, * this one is kinda strange - Eric called allocate(), then * storeCossOpen(O_RDONLY) .. weird. Anyway, I'm allocating this now. */ - cstate->st_size = objectLen(&e) + e.mem_obj->swap_hdr_sz; + cstate->st_size = e.objectLen() + e.mem_obj->swap_hdr_sz; sio->swap_dirn = index; sio->swap_filen = allocate(&e, COSS_ALLOC_ALLOCATE); debug(79, 3) ("storeCossCreate: offset %ld, size %ld, end %ld\n",