diff options
author | Arne H Juul <arnej@yahooinc.com> | 2021-09-20 09:33:02 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2021-09-20 10:28:52 +0000 |
commit | 5c799334429a94cc1988749e8da7d4dd1edce5d5 (patch) | |
tree | 4b83bb5225b24a55a1536df9c2985cdb8182fad0 /slobrok | |
parent | faee01dcda4475c941a7815ff2a0be32d9585ef9 (diff) |
match in unnamed namespace
Diffstat (limited to 'slobrok')
-rw-r--r-- | slobrok/src/vespa/slobrok/server/rpchooks.cpp | 57 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/rpchooks.h | 1 |
2 files changed, 19 insertions, 39 deletions
diff --git a/slobrok/src/vespa/slobrok/server/rpchooks.cpp b/slobrok/src/vespa/slobrok/server/rpchooks.cpp index f07b8161d62..d51b1c6d276 100644 --- a/slobrok/src/vespa/slobrok/server/rpchooks.cpp +++ b/slobrok/src/vespa/slobrok/server/rpchooks.cpp @@ -38,6 +38,25 @@ public: ~MetricsReport() override { Kill(); } }; +bool match(const char *name, const char *pattern) { + LOG_ASSERT(name != nullptr); + LOG_ASSERT(pattern != nullptr); + while (*pattern != '\0') { + if (*name == *pattern) { + ++name; + ++pattern; + } else if (*pattern == '*') { + ++pattern; + while (*name != '/' && *name != '\0') { + ++name; + } + } else { + return false; + } + } + return (*name == *pattern); +} + } // namespace <unnamed> //----------------------------------------------------------------------------- @@ -65,25 +84,6 @@ void RPCHooks::reportMetrics() { EV_COUNT("other_reqs", _cnts.otherReqs); } -bool RPCHooks::match(const char *name, const char *pattern) { - LOG_ASSERT(name != nullptr); - LOG_ASSERT(pattern != nullptr); - while (*pattern != '\0') { - if (*name == *pattern) { - ++name; - ++pattern; - } else if (*pattern == '*') { - ++pattern; - while (*name != '/' && *name != '\0') { - ++name; - } - } else { - return false; - } - } - return (*name == *pattern); -} - void RPCHooks::initRPC(FRT_Supervisor *supervisor) { _m_reporter = std::make_unique<MetricsReport>(supervisor, *this); @@ -234,25 +234,6 @@ bool RPCHooks::useNewLogic() const { return _env.useNewLogic(); } -bool RPCHooks::match(const char *name, const char *pattern) { - LOG_ASSERT(name != nullptr); - LOG_ASSERT(pattern != nullptr); - while (*pattern != '\0') { - if (*name == *pattern) { - ++name; - ++pattern; - } else if (*pattern == '*') { - ++pattern; - while (*name != '/' && *name != '\0') { - ++name; - } - } else { - return false; - } - } - return (*name == *pattern); -} - void RPCHooks::rpc_listNamesServed(FRT_RPCRequest *req) { FRT_Values &dst = *req->GetReturn(); diff --git a/slobrok/src/vespa/slobrok/server/rpchooks.h b/slobrok/src/vespa/slobrok/server/rpchooks.h index b003376e75e..bb2eb91eda9 100644 --- a/slobrok/src/vespa/slobrok/server/rpchooks.h +++ b/slobrok/src/vespa/slobrok/server/rpchooks.h @@ -57,7 +57,6 @@ public: private: bool useNewLogic() const; - static bool match(const char *name, const char *pattern); void rpc_lookupRpcServer(FRT_RPCRequest *req); |