1
0
mirror of https://github.com/squid-cache/squid.git synced 2025-04-18 22:04:07 +03:00

Maintenance: remove HERE (#1972)

HERE has been deprecated for a while; there is only
one remaining instance of it.
This commit is contained in:
Francesco Chemolli 2024-12-31 14:58:49 +00:00 committed by Squid Anubis
parent 16cafa1f06
commit e66b20c56d
3 changed files with 2 additions and 38 deletions

View File

@ -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 }

View File

@ -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");
*/

View File

@ -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) {}