move string_format to class

master
Geoffrey Merck 4 years ago
parent 9768490c3b
commit 7adb8b1c6a

@ -852,7 +852,7 @@ void CDCSHandler::writeStatus(std::ofstream& file)
case DIR_OUTGOING:
if (reflector->m_linkState == DCS_LINKED) {
std::string text;
text = string_format("%04d-%02d-%02d %02d:%02d:%02d: DCS link - Type: Repeater Rptr: %s Refl: %s Dir: Outgoing\n",
text = CStringUtils::string_format("%04d-%02d-%02d %02d:%02d:%02d: DCS link - Type: Repeater Rptr: %s Refl: %s Dir: Outgoing\n",
tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec,
reflector->m_repeater.c_str(), GET_DISP_REFLECTOR(reflector).c_str());
file << text;
@ -862,7 +862,7 @@ void CDCSHandler::writeStatus(std::ofstream& file)
case DIR_INCOMING:
if (reflector->m_linkState == DCS_LINKED) {
std::string text;
text = string_format("%04d-%02d-%02d %02d:%02d:%02d: DCS link - Type: Repeater Rptr: %s Refl: %s Dir: Incoming\n",
text = CStringUtils::string_format("%04d-%02d-%02d %02d:%02d:%02d: DCS link - Type: Repeater Rptr: %s Refl: %s Dir: Incoming\n",
tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec,
reflector->m_repeater.c_str(), GET_DISP_REFLECTOR(reflector).c_str());
file << text;

@ -387,7 +387,7 @@ void CDDHandler::writeStatus(const CEthernet& ethernet)
time_t timeNow = ::time(NULL);
struct tm* tm = ::gmtime(&timeNow);
std::string text = string_format("%04d-%02d-%02d %02d:%02d:%02d: %02X:%02X:%02X:%02X:%02X:%02X %s\n",
std::string text = CStringUtils::string_format("%04d-%02d-%02d %02d:%02d:%02d: %02X:%02X:%02X:%02X:%02X:%02X %s\n",
tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec,
address[0], address[1], address[2], address[3], address[4], address[5], callsign.c_str());

Loading…
Cancel
Save

Powered by TurnKey Linux.