From 92d9973ace2e52819be141d2dacab1d3bcb23ce0 Mon Sep 17 00:00:00 2001 From: SASANO Takayoshi Date: Thu, 5 Mar 2020 19:26:02 +0900 Subject: [PATCH] revise LogWarning message, and cosmetic changes --- UserDB.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/UserDB.cpp b/UserDB.cpp index 2e20fb0..4463f25 100644 --- a/UserDB.cpp +++ b/UserDB.cpp @@ -58,7 +58,7 @@ bool CUserDB::load(std::string const& filename) { FILE* fp = ::fopen(filename.c_str(), "r"); if (fp == NULL) { - LogWarning("Cannot open ID lookup table - %s", filename.c_str()); + LogWarning("Cannot open ID lookup file - %s", filename.c_str()); return false; } @@ -79,7 +79,7 @@ bool CUserDB::load(std::string const& filename) // no index - set default std::unordered_map index; if (!makeindex(buffer, index)) { - ::strncpy(buffer, "RADIO_ID,CALLSIGN,FIRST_NAME", sizeof(buffer)); + ::strncpy(buffer, keyRADIO_ID "," keyCALLSIGN "," keyFIRST_NAME, sizeof(buffer)); makeindex(buffer, index); ::rewind(fp); } @@ -96,7 +96,7 @@ bool CUserDB::load(std::string const& filename) LogInfo("Loaded %u IDs to lookup table - %s", size, filename.c_str()); - return (size != 0U); + return size != 0U; } bool CUserDB::makeindex(char* buf, std::unordered_map& index)