X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Flog_entry.cc;h=8a665481154705638b421dce066b29753de40670;hp=d29b56747306f0b9a23aff6e3b49c0f678c9d659;hb=2bd3a2f185b4755c4a01ba5c34c1d3e1f78e5c97;hpb=ad3e8cff006ccecdb44520f8cc8fd1eaa8daf755 diff --git a/src/lib/log_entry.cc b/src/lib/log_entry.cc index d29b56747..8a6654811 100644 --- a/src/lib/log_entry.cc +++ b/src/lib/log_entry.cc @@ -1,24 +1,26 @@ /* Copyright (C) 2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #include "log_entry.h" -#include "safe_stringstream.h" +#include +#include #include "i18n.h" @@ -41,28 +43,30 @@ LogEntry::LogEntry (int type) string LogEntry::get () const { - SafeStringStream s; + string s; if (_type & TYPE_TIMING) { - s << _time.tv_sec << ":" << _time.tv_usec << " "; + char buffer[64]; + snprintf (buffer, sizeof(buffer), "%" PRId64 ":%" PRId64 " ", static_cast (_time.tv_sec), static_cast (_time.tv_usec)); + s += buffer; } else { char buffer[64]; time_t const sec = _time.tv_sec; struct tm* t = localtime (&sec); strftime (buffer, 64, "%c", t); string a (buffer); - s << a.substr (0, a.length() - 1) << N_(": "); + s += string(buffer) + N_(": "); } if (_type & TYPE_ERROR) { - s << "ERROR: "; + s += "ERROR: "; } if (_type & TYPE_WARNING) { - s << "WARNING: "; + s += "WARNING: "; } - s << message (); - return s.str (); + s += message (); + return s; } double