From b4cba3844d07292e58c7c906485923819b64457b Mon Sep 17 00:00:00 2001 From: Ryszard Rozak Date: Wed, 21 May 2025 15:38:44 +0200 Subject: [PATCH] Change function names Signed-off-by: Ryszard Rozak --- src/VlcOptions.h | 4 ++-- src/VlcPoint.h | 4 ++-- src/VlcTop.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/VlcOptions.h b/src/VlcOptions.h index 9c1a760ca..13db7c588 100644 --- a/src/VlcOptions.h +++ b/src/VlcOptions.h @@ -71,8 +71,8 @@ public: bool unlink() const { return m_unlink; } string writeFile() const { return m_writeFile; } string writeInfoFile() const { return m_writeInfoFile; } - bool isTypeOk(const char* name) const { - return m_filterType == "" || m_filterType == VlcPoint::type(name); + bool isTypeMatch(const char* name) const { + return m_filterType == "" || m_filterType == VlcPoint::typeExtract(name); } // METHODS (from main) diff --git a/src/VlcPoint.h b/src/VlcPoint.h index 1e0f5a62b..f26d10dde 100644 --- a/src/VlcPoint.h +++ b/src/VlcPoint.h @@ -64,7 +64,7 @@ public: string filename() const { return keyExtract(VL_CIK_FILENAME, m_name.c_str()); } string comment() const { return keyExtract(VL_CIK_COMMENT, m_name.c_str()); } string hier() const { return keyExtract(VL_CIK_HIER, m_name.c_str()); } - string type() const { return type(m_name.c_str()); } + string type() const { return typeExtract(m_name.c_str()); } string thresh() const { // string as maybe "" return keyExtract(VL_CIK_THRESH, m_name.c_str()); @@ -79,7 +79,7 @@ public: return std::atoi(columnStr.c_str()); } // METHODS - static string type(const char* name) { return keyExtract(VL_CIK_TYPE, name); } + static string typeExtract(const char* name) { return keyExtract(VL_CIK_TYPE, name); } static string keyExtract(const char* shortKey, const char* name) { // Hot function const size_t shortLen = std::strlen(shortKey); diff --git a/src/VlcTop.cpp b/src/VlcTop.cpp index 87670f6ca..c4930f349 100644 --- a/src/VlcTop.cpp +++ b/src/VlcTop.cpp @@ -51,7 +51,7 @@ void VlcTop::readCoverage(const string& filename, bool nonfatal) { if (line[secspace] == '\'' && line[secspace + 1] == ' ') break; } const string point = line.substr(3, secspace - 3); - if (!opt.isTypeOk(point.c_str())) continue; + if (!opt.isTypeMatch(point.c_str())) continue; const uint64_t hits = std::atoll(line.c_str() + secspace + 1); // UINFO(9," point '"<