From a2e91f3cf2b3f844765f2a0c3a32d58d9a48d901 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Sat, 8 Mar 2025 22:09:34 -0500 Subject: [PATCH] Internals: Add some const. No functional change. --- src/V3Options.cpp | 18 ++++++++---------- src/VlcSource.h | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/V3Options.cpp b/src/V3Options.cpp index bb1ede840..6f5885ef6 100644 --- a/src/V3Options.cpp +++ b/src/V3Options.cpp @@ -506,7 +506,7 @@ string V3Options::fileExists(const string& filename) { m_impp->m_dirMap.emplace(dir, std::set()); diriter = m_impp->m_dirMap.find(dir); - std::set* setp = &(diriter->second); + std::set* const setp = &(diriter->second); #ifdef _MSC_VER try { @@ -524,13 +524,11 @@ string V3Options::fileExists(const string& filename) { #endif } // Find it - const std::set* filesetp = &(diriter->second); + const std::set* const filesetp = &(diriter->second); const auto fileiter = filesetp->find(basename); - if (fileiter == filesetp->end()) { - return ""; // Not found - } + if (fileiter == filesetp->end()) return ""; // Not found // Check if it is a directory, ignore if so - string filenameOut = V3Os::filenameJoin(dir, basename); + const string filenameOut = V3Os::filenameJoin(dir, basename); if (!fileStatNormal(filenameOut)) return ""; // Directory return filenameOut; } @@ -538,7 +536,7 @@ string V3Options::fileExists(const string& filename) { string V3Options::filePathCheckOneDir(const string& modname, const string& dirname) { for (const string& i : m_impp->m_libExtVs) { const string fn = V3Os::filenameJoin(dirname, modname + i); - string exists = fileExists(fn); + const string exists = fileExists(fn); if (exists != "") return exists; } return ""; @@ -578,15 +576,15 @@ string V3Options::filePath(FileLine* fl, const string& modname, const string& la const string filename = V3Os::filenameCleanup(VName::dehash(modname)); if (!V3Os::filenameIsRel(filename)) { // filename is an absolute path, so can find getStdPackagePath()/getStdWaiverPath() - string exists = filePathCheckOneDir(filename, ""); + const string exists = filePathCheckOneDir(filename, ""); if (exists != "") return exists; } for (const string& dir : m_impp->m_incDirUsers) { - string exists = filePathCheckOneDir(filename, dir); + const string exists = filePathCheckOneDir(filename, dir); if (exists != "") return exists; } for (const string& dir : m_impp->m_incDirFallbacks) { - string exists = filePathCheckOneDir(filename, dir); + const string exists = filePathCheckOneDir(filename, dir); if (exists != "") return exists; } diff --git a/src/VlcSource.h b/src/VlcSource.h index 8e00667a1..054bee030 100644 --- a/src/VlcSource.h +++ b/src/VlcSource.h @@ -73,7 +73,7 @@ public: private: // MEMBERS - string m_name; //< Name of the source file + const string m_name; //< Name of the source file LinenoMap m_lines; //< Map of each annotated line bool m_needed = false; //< Need to annotate; has low coverage