Maintenance: remove HERE (#1972)

HERE has been deprecated for a while; there is only
one remaining instance of it.

diff --git a/scripts/maintenance/HERE-obsolete b/scripts/maintenance/HERE-obsolete
deleted file mode 100755 (executable)
index 213c2cb..0000000
--- a/scripts/maintenance/HERE-obsolete
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/awk -f
-#
-## Copyright (C) 1996-2023 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.
-##
-
-/HERE/ {
-  # HERE is obsolete
-  gsub(/,[ ]?HERE\)/, ", MYNAME)");
-  gsub(/,[ ]?[ ]?HERE[ ]?[ ]?<<[ ]?["]:[ ]/, ", \"");
-  gsub(/,[ ]?[ ]?HERE[ ]?[ ]?<<[ ]?/, ", ");
-  gsub(/[ ][ ][ ][ ]HERE[ ]?[ ]?<<[ ]?/, "    ");
-}
-{ print }

diff --git a/src/debug/Stream.h b/src/debug/Stream.h
index 156a8c05f20891eda33697492c99730261f7ba5b..0b8c43b010aa33563f3020db995e9e331d9ecee6 100644 (file)
--- a/src/debug/Stream.h
+++ b/src/debug/Stream.h
@@ -208,23 +208,8 @@ void ResyncDebugLog(FILE *newDestination);
 /// Outside of debugs() context, has no effect and should not be used.
 std::ostream& ForceAlert(std::ostream& s);
 
-/** stream manipulator which does nothing.
- * \deprecated Do not add to new code, and remove when editing old code
- *
- * Its purpose is to inactivate calls made following previous debugs()
- * guidelines such as
- * debugs(1,2, "some message");
- *
- * His former objective is now absorbed in the debugs call itself
- */
-inline std::ostream&
-HERE(std::ostream& s)
-{
-    return s;
-}
-
 /*
- * MYNAME is for use at debug levels 0 and 1 where HERE is too messy.
+ * MYNAME is for use (in rare/special cases) at debug levels 0 and 1
  *
  * debugs(1,1, MYNAME << "WARNING: some message");
  */

diff --git a/src/tests/stub_cache_manager.cc b/src/tests/stub_cache_manager.cc
index 04dbf7f35b3b056ce637f5dfa612d9d00e086565..8f328806d7228818a38669f647ca373cbe9f4cc9 100644 (file)
--- a/src/tests/stub_cache_manager.cc
+++ b/src/tests/stub_cache_manager.cc
@@ -15,11 +15,7 @@
 #include "tests/STUB.h"
 
 Mgr::Action::Pointer CacheManager::createNamedAction(char const*) STUB_RETVAL(nullptr)
-void CacheManager::start(const Comm::ConnectionPointer &, HttpRequest *, StoreEntry *, const AccessLogEntryPointer &)
-{
-    std::cerr << HERE << "\n";
-    STUB
-}
+void CacheManager::start(const Comm::ConnectionPointer &, HttpRequest *, StoreEntry *, const AccessLogEntryPointer &) STUB
 static CacheManager* instance = nullptr;
 CacheManager* CacheManager::GetInstance() STUB_RETVAL(instance)
 void Mgr::RegisterAction(char const *, char const *, OBJH *, Protected, Atomic, Format) {}