tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] fix logging so we don't use strings as a formatter

Browse Source
This commit is contained in:
Konstantin Käfer
2015-10-02 15:55:21 +02:00
parent bbf16b2b1d
commit 69564cc886
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
linux/main.cpp
View File

@@ -139,7 +139,7 @@ int main(int argc, char *argv[]) {
map.setStyleURL(newStyle.url);
view->setWindowTitle(newStyle.name);
mbgl::Log::Info(mbgl::Event::Setup, std::string("Changed style to: ") + newStyle.name);
mbgl::Log::Info(mbgl::Event::Setup, "Changed style to: %s", newStyle.name);
});
// Load style

2
macosx/main.mm
View File

@@ -180,7 +180,7 @@ int main(int argc, char* argv[]) {
map.setStyleURL(newStyle.url);
view.setWindowTitle(newStyle.name);
mbgl::Log::Info(mbgl::Event::Setup, std::string("Changed style to: ") + newStyle.name);
mbgl::Log::Info(mbgl::Event::Setup, "Changed style to: %s", newStyle.name);
});

2
platform/default/image.cpp
View File

@@ -86,7 +86,7 @@ Image::Image(std::string const& data)
}
catch (ImageReaderException const& ex)
{
Log::Error(Event::Image, ex.what());
Log::Error(Event::Image, "%s", ex.what());
img.reset();
width = 0;
height = 0;

4
platform/default/sqlite_cache.cpp
View File

@@ -134,7 +134,7 @@ void SQLiteCache::Impl::get(const Resource &resource, Callback callback) {
Log::Error(Event::Database, ex.code, ex.what());
callback(nullptr);
} catch (std::runtime_error& ex) {
Log::Error(Event::Database, ex.what());
Log::Error(Event::Database, "%s", ex.what());
callback(nullptr);
}
}
@@ -204,7 +204,7 @@ void SQLiteCache::Impl::put(const Resource& resource, std::shared_ptr<const Resp
} catch (mapbox::sqlite::Exception& ex) {
Log::Error(Event::Database, ex.code, ex.what());
} catch (std::runtime_error& ex) {
Log::Error(Event::Database, ex.what());
Log::Error(Event::Database, "%s", ex.what());
}
}

2
src/mbgl/util/stopwatch.cpp
View File

@@ -23,7 +23,7 @@ stopwatch::stopwatch(const std::string &name_, EventSeverity severity_, Event ev
void stopwatch::report(const std::string &name_) {
Duration duration = Clock::now() - start;
Log::Record(severity, event, name_ + ": " + util::toString(std::chrono::duration_cast<std::chrono::milliseconds>(duration).count()) + "ms");
Log::Record(severity, event, "%s: %fms", name_.c_str(), std::chrono::duration<float, std::chrono::milliseconds::period>(duration).count());
start += duration;
}