diff --git a/reflector/BlackWhiteSet.cpp b/reflector/BlackWhiteSet.cpp index 911df48..6359c25 100644 --- a/reflector/BlackWhiteSet.cpp +++ b/reflector/BlackWhiteSet.cpp @@ -97,7 +97,7 @@ bool CBlackWhiteSet::ReloadFromFile(void) { bool ok = false; - if ( m_Filename.empty() ) + if ( ! m_Filename.empty() ) { ok = LoadFromFile(m_Filename); } diff --git a/reflector/BlackWhiteSet.h b/reflector/BlackWhiteSet.h index 5b2797e..cf3efa7 100644 --- a/reflector/BlackWhiteSet.h +++ b/reflector/BlackWhiteSet.h @@ -31,7 +31,7 @@ class CBlackWhiteSet { public: // constructor - CBlackWhiteSet() : m_Filename(nullptr), m_LastModTime(0) {} + CBlackWhiteSet() : m_LastModTime(0) {} // locks void Lock(void) const { m_Mutex.lock(); } diff --git a/reflector/InterlinkMap.cpp b/reflector/InterlinkMap.cpp index 8466f90..23e35ff 100644 --- a/reflector/InterlinkMap.cpp +++ b/reflector/InterlinkMap.cpp @@ -33,7 +33,7 @@ CInterlinkMap::CInterlinkMap() { - m_Filename = nullptr; + m_Filename.clear(); ::memset(&m_LastModTime, 0, sizeof(time_t)); } @@ -119,7 +119,7 @@ bool CInterlinkMap::LoadFromFile(const std::string &filename) file.close(); // keep file path - m_Filename = filename; + m_Filename.assign(filename); // update time GetLastModTime(&m_LastModTime);