F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: refactor char* to string in log

Browse Source
This commit is contained in:
Peter Barnes
2023-02-23 22:46:31 +00:00
parent 59805a21c1
commit 038527e57e
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/model/log.cc
View File

@@ -277,10 +277,10 @@ LogComponent::Disable(const LogLevel level)
m_levels &= ~level;
}
const char*
std::string
LogComponent::Name() const
{
return m_name.c_str();
return m_name;
}
std::string
@@ -302,7 +302,7 @@ LogComponent::GetLevelLabel(const LogLevel level)
}
void
LogComponentEnable(const char* name, LogLevel level)
LogComponentEnable(const std::string& name, LogLevel level)
{
LogComponent::ComponentList* components = LogComponent::GetComponentList();
LogComponent::ComponentList::const_iterator i;
@@ -338,7 +338,7 @@ LogComponentEnableAll(LogLevel level)
}
void
LogComponentDisable(const char* name, LogLevel level)
LogComponentDisable(const std::string& name, LogLevel level)
{
LogComponent::ComponentList* components = LogComponent::GetComponentList();
for (LogComponent::ComponentList::const_iterator i = components->begin();
@@ -448,12 +448,11 @@ LogComponentPrintList()
static bool
ComponentExists(std::string componentName)
{
const char* name = componentName.c_str();
LogComponent::ComponentList* components = LogComponent::GetComponentList();
LogComponent::ComponentList::const_iterator i;
for (i = components->begin(); i != components->end(); i++)
{
if (i->first == name)
if (i->first == componentName)
{
return true;
}

6
src/core/model/log.h
View File

@@ -134,7 +134,7 @@ enum LogLevel
* \param [in] name The log component name.
* \param [in] level The logging level.
*/
void LogComponentEnable(const char* name, LogLevel level);
void LogComponentEnable(const std::string& name, LogLevel level);
/**
* Enable the logging output for all registered log components.
@@ -155,7 +155,7 @@ void LogComponentEnableAll(LogLevel level);
* \param [in] name The log component name.
* \param [in] level The logging level.
*/
void LogComponentDisable(const char* name, LogLevel level);
void LogComponentDisable(const std::string& name, LogLevel level);
/**
* Disable all logging for all components.
@@ -367,7 +367,7 @@ class LogComponent
*
* \return The name of this LogComponent.
*/
const char* Name() const;
std::string Name() const;
/**
* Get the compilation unit defining this LogComponent.
* \returns The file name.