Refactor logger to do message formatting internally

[builder.git] / source / cache.cpp

diff --git a/source/cache.cpp b/source/cache.cpp
index 229783a002b92cf9b966e0459f010b028a1df490..30f3fc33a67141fe996874865828a76dd5ca39eb 100644 (file)
--- a/source/cache.cpp
+++ b/source/cache.cpp
@@ -78,14 +78,14 @@ void Cache::append_value(const Target *tgt, const string &k, const string &v)
                i = data.insert({ key, Values() }).first;
        i->second.push_back(v);
        changed = true;
-       package.get_builder().get_logger().log("cache", format("Updated key %s %s+ %s", tgt->get_name(), k, v));
+       package.get_builder().get_logger().log("cache", "Updated key %s %s+ %s", tgt->get_name(), k, v);
 }
 
 void Cache::set_values(const Target *tgt, const string &k, const Values &v)
 {
        data[Key(tgt->get_name(), k)] = v;
        changed = true;
-       package.get_builder().get_logger().log("cache", format("Updated key %s %s: %s", tgt->get_name(), k, join(v.begin(), v.end())));
+       package.get_builder().get_logger().log("cache", "Updated key %s %s: %s", tgt->get_name(), k, join(v.begin(), v.end()));
 }
 
 const string &Cache::get_value(const Target *tgt, const string &k)
@@ -110,7 +110,7 @@ void Cache::load()
 {
        if(FS::Stat st = FS::stat(filename))
        {
-               package.get_builder().get_logger().log("files", format("Reading %s", filename));
+               package.get_builder().get_logger().log("files", "Reading %s", filename);
                IO::BufferedFile in(filename.str());
 
                while(!in.eof())
@@ -123,7 +123,7 @@ void Cache::load()
                        Values &values = data[key];
                        for(unsigned count = read_count(in); count; --count)
                                values.push_back(read_string(in));
-                       package.get_builder().get_logger().log("cache", format("Loaded key %s %s: %s", key.first, key.second, join(values.begin(), values.end())));
+                       package.get_builder().get_logger().log("cache", "Loaded key %s %s: %s", key.first, key.second, join(values.begin(), values.end()));
                }
 
                mtime = st.get_modify_time();
@@ -138,7 +138,7 @@ void Cache::save() const
        FS::Path dir = FS::dirname(filename);
        if(!FS::exists(dir))
                FS::mkpath(dir, 0755);
-       package.get_builder().get_logger().log("files", format("Writing %s", filename));
+       package.get_builder().get_logger().log("files", "Writing %s", filename);
        IO::BufferedFile out(filename.str(), IO::M_WRITE);
 
        for(const auto &kvp: data)