converted stub_StatHist.cc stub_main_cc.cc stub_mem.cc stub_store_rebuild.cc to stub API

diff --git a/src/tests/stub_StatHist.cc b/src/tests/stub_StatHist.cc
index f3d70947d3c53755be9f9b3ad9889d8d73263300..8b1dfca5128e50309dcbd3c0cb8f786837339525 100644 (file)
--- a/src/tests/stub_StatHist.cc
+++ b/src/tests/stub_StatHist.cc
@@ -1,35 +1,16 @@
 #include "squid.h"
-#define STUB_API "StatHist.cc"
-#include "STUB.h"
 #include "StatHist.h"
 
-
-void
-StatHist::dump(StoreEntry * sentry, StatHistBinDumper * bd) const
-{}
-
-void
-StatHist::enumInit(unsigned int i)
-{}
-
-void
-StatHist::count(double d)
-{}
-
-double
-statHistDeltaMedian(const StatHist & A, const StatHist & B)
-STUB_RETVAL(0.0)
-
-double
-statHistDeltaPctile(const StatHist & A, const StatHist & B, double pctile)
-STUB_RETVAL(0.0)
-
-void
-StatHist::logInit(unsigned int i, double d1, double d2)
-STUB
+#define STUB_API "StatHist.cc"
+#include "STUB.h"
 
 class StoreEntry;
-void
-statHistIntDumper(StoreEntry * sentry, int idx, double val, double size, int count)
-STUB
+
+void StatHist::dump(StoreEntry * sentry, StatHistBinDumper * bd) const STUB
+void StatHist::enumInit(unsigned int i) STUB_NOP
+void StatHist::count(double d) STUB_NOP
+double statHistDeltaMedian(const StatHist & A, const StatHist & B) STUB_RETVAL(0.0)
+double statHistDeltaPctile(const StatHist & A, const StatHist & B, double pctile) STUB_RETVAL(0.0)
+void StatHist::logInit(unsigned int i, double d1, double d2) STUB
+void statHistIntDumper(StoreEntry * sentry, int idx, double val, double size, int count) STUB
 

diff --git a/src/tests/stub_main_cc.cc b/src/tests/stub_main_cc.cc
index 39d3a6f6762b5e94d2c27cb3b349f6c05ba50bb9..c1e1740091f7c8609e90682ffc93ca5545a89ccb 100644 (file)
--- a/src/tests/stub_main_cc.cc
+++ b/src/tests/stub_main_cc.cc
@@ -35,15 +35,10 @@
 
 #include "squid.h"
 
-void
-shut_down(int)
-{ /* stub */ }
+#define STUB_API "stub_main_cc.cc"
+#include "tests/STUB.h"
 
-void
-reconfigure(int)
-{ /* stub */ }
-
-void
-rotate_logs(int)
-{ /* stub */ }
+void shut_down(int) STUB
+void reconfigure(int) STUB
+void rotate_logs(int) STUB
 

diff --git a/src/tests/stub_mem.cc b/src/tests/stub_mem.cc
index 53cc877b1fb69e55f92700860770b8e9593b72e3..ab909337209a15aa3b96c72e0eb2e5a650c230c7 100644 (file)
--- a/src/tests/stub_mem.cc
+++ b/src/tests/stub_mem.cc
@@ -60,10 +60,5 @@ memFreeBufFunc(size_t size)
     return cxx_xfree;
 }
 
-void *
-memAllocate(mem_type type)
-STUB_RETVAL(NULL)
-
-void
-memFree(void *p, int type)
-STUB
+void * memAllocate(mem_type type) STUB_RETVAL(NULL)
+void memFree(void *p, int type) STUB

diff --git a/src/tests/stub_store_rebuild.cc b/src/tests/stub_store_rebuild.cc
index 56cee08e00bdd4b0bd2d11c862dfbdbea4ed7082..744ea932bcdb4955691c7bab99f4e49b9dc844ac 100644 (file)
--- a/src/tests/stub_store_rebuild.cc
+++ b/src/tests/stub_store_rebuild.cc
@@ -34,30 +34,14 @@
 
 #include "squid-old.h"
 
-void
-storeRebuildProgress(int sd_index, int total, int sofar)
-{}
+#define STUB_API "stub_store_rebuild.cc"
+#include "tests/STUB.h"
 
-void
-
-storeRebuildComplete(struct _store_rebuild_data *dc)
-{}
-
-bool
-storeRebuildLoadEntry(int, int, MemBuf&, _store_rebuild_data&)
-{
-    return false;
-}
-
-bool
-storeRebuildKeepEntry(const StoreEntry &tmpe, const cache_key *key,
-                      struct _store_rebuild_data &counts)
-{
-    return false;
-}
-
-bool
-storeRebuildParseEntry(MemBuf &, StoreEntry &, cache_key *, struct _store_rebuild_data &, uint64_t)
+void storeRebuildProgress(int sd_index, int total, int sofar) STUB
+void storeRebuildComplete(struct _store_rebuild_data *dc) STUB_NOP
+bool storeRebuildLoadEntry(int, int, MemBuf&, _store_rebuild_data&)
 {
     return false;
 }
+bool storeRebuildKeepEntry(const StoreEntry &tmpe, const cache_key *key, struct _store_rebuild_data &counts) STUB_RETVAL(false)
+bool storeRebuildParseEntry(MemBuf &, StoreEntry &, cache_key *, struct _store_rebuild_data &, uint64_t) STUB_RETVAL(false)