From: Dmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>
Date: Sun, 17 Apr 2011 10:27:49 +0000 (+0400)
Subject: Fix COSS build:
X-Git-Tag: take06~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce5674957dc4ab9e42be3b47ca9caca3d05e5be6;p=thirdparty%2Fsquid.git

Fix COSS build:

* call MemAllocator::freeOne() instead of MemAllocator::free()
* add unused "how" argument to CossState::close()
* fix signed-with-unsigned comparison
---

diff --git a/src/fs/coss/store_coss.h b/src/fs/coss/store_coss.h
index bc478e0768..b37edaddec 100644
--- a/src/fs/coss/store_coss.h
+++ b/src/fs/coss/store_coss.h
@@ -79,7 +79,7 @@ public:
     off_t st_size;
     void read_(char *buf, size_t size, off_t offset, STRCB * callback, void *callback_data);
     void write(char const *buf, size_t size, off_t offset, FREE * free_func);
-    void close();
+    virtual void close(int);
     void doCallback(int errflag);
     void lockMemBuf();
 
diff --git a/src/fs/coss/store_dir_coss.cc b/src/fs/coss/store_dir_coss.cc
index 9fe4a038b2..6f033ba759 100644
--- a/src/fs/coss/store_dir_coss.cc
+++ b/src/fs/coss/store_dir_coss.cc
@@ -358,7 +358,7 @@ storeCossRemove(CossSwapDir * sd, StoreEntry * e)
     CossIndexNode *coss_node = (CossIndexNode *)e->repl.data;
     e->repl.data = NULL;
     dlinkDelete(&coss_node->node, &sd->cossindex);
-    coss_index_pool->free(coss_node);
+    coss_index_pool->freeOne(coss_node);
     sd->count -= 1;
 }
 
@@ -930,7 +930,7 @@ CossSwapDir::create()
 
     memset(&block, '\0', 1024);
 
-    for (off_t offset = 0; offset < max_size; ++offset) {
+    for (uint64_t offset = 0; offset < max_size; ++offset) {
         if (write (swap, block, 1024) < 1024) {
             debugs (47, 0, "Failed to create COSS swap space in " << path);
         }
diff --git a/src/fs/coss/store_io_coss.cc b/src/fs/coss/store_io_coss.cc
index 659395d85a..d0c2cf7af9 100644
--- a/src/fs/coss/store_io_coss.cc
+++ b/src/fs/coss/store_io_coss.cc
@@ -275,8 +275,9 @@ CossSwapDir::openStoreIO(StoreEntry & e, StoreIOState::STFNCB * file_callback,
     return sio;
 }
 
+/// COSS does not distinguish different closure types
 void
-CossState::close()
+CossState::close(int)
 {
     debugs(79, 3, "storeCossClose: offset " << swap_filen);