From aeb894aa68def74b1061e98821e408c10c01f81d Mon Sep 17 00:00:00 2001
From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 21 Jul 2015 06:20:11 -0700
Subject: [PATCH] SourceMaintenance updates

---
 src/tests/Stub.list            |  2 +-
 src/tests/stub_DiskIOModule.cc | 24 ------------------------
 src/tests/stub_libdiskio.cc    |  1 +
 3 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 src/tests/stub_DiskIOModule.cc

diff --git a/src/tests/Stub.list b/src/tests/Stub.list
index 72413414f7..0b4aab9795 100644
--- a/src/tests/Stub.list
+++ b/src/tests/Stub.list
@@ -22,7 +22,6 @@ STUB_SOURCE= tests/STUB.h \
 	tests/stub_CommIO.cc \
 	tests/stub_debug.cc \
 	tests/stub_DelayId.cc \
-	tests/stub_DiskIOModule.cc \
 	tests/stub_errorpage.cc \
 	tests/stub_ETag.cc \
 	tests/stub_event.cc \
@@ -44,6 +43,7 @@ STUB_SOURCE= tests/STUB.h \
 	tests/stub_libauth_acls.cc \
 	tests/stub_libauth.cc \
 	tests/stub_libcomm.cc \
+	tests/stub_libdiskio.cc \
 	tests/stub_libeui.cc \
 	tests/stub_libformat.cc \
 	tests/stub_libicmp.cc \
diff --git a/src/tests/stub_DiskIOModule.cc b/src/tests/stub_DiskIOModule.cc
deleted file mode 100644
index 4787fc9e51..0000000000
--- a/src/tests/stub_DiskIOModule.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
- *
- * Squid software is distributed under GPLv2+ license and includes
- * contributions from numerous individuals and organizations.
- * Please see the COPYING and CONTRIBUTORS files for details.
- */
-
-#include "squid.h"
-
-#define STUB_API "DiskIOModule.cc"
-#include "tests/STUB.h"
-
-#include "DiskIO/DiskIOModule.h"
-
-#include <vector>
-
-void DiskIOModule::SetupAllModules() STUB
-void DiskIOModule::ModuleAdd(DiskIOModule &) STUB
-void DiskIOModule::FreeAllModules() STUB
-DiskIOModule *DiskIOModule::Find(char const *) STUB_RETVAL(NULL)
-DiskIOModule *DiskIOModule::FindDefault() STUB_RETVAL(NULL)
-std::vector<DiskIOModule*> const &DiskIOModule::Modules() STUB_RETSTATREF(std::vector<DiskIOModule*>)
-
diff --git a/src/tests/stub_libdiskio.cc b/src/tests/stub_libdiskio.cc
index b902cf2e63..1846e68f8c 100644
--- a/src/tests/stub_libdiskio.cc
+++ b/src/tests/stub_libdiskio.cc
@@ -33,3 +33,4 @@ ReadRequest::ReadRequest(char *, off_t, size_t) {STUB}
 
 #include "DiskIO/WriteRequest.h"
 WriteRequest::WriteRequest(char const *, off_t, size_t, FREE *) {STUB}
+
-- 
2.47.3