Refactor logger to do message formatting internally

[builder.git] / source / virtualfilesystem.cpp

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index 2fecdf0fc50c9427fd1d06c194b597b7b41ff864..d3bc708faf99cbf25944d764f7054d40c643be00 100644 (file)
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -32,7 +32,7 @@ void VirtualFileSystem::register_path(const FS::Path &path, FileTarget *t)
 {
        targets.insert({ path, t });
        nonexistent.erase(path);
-       builder.get_logger().log("vfs", format("Path %s registered to %s", path, t->get_name()));
+       builder.get_logger().log("vfs", "Path %s registered to %s", path, t->get_name());
 }
 
 FileTarget *VirtualFileSystem::find_header(const string &name, Tool *tool, const SearchPath &path, bool use_syspath)
@@ -56,16 +56,16 @@ FileTarget *VirtualFileSystem::find_header(const string &name, Tool *tool, const
                FS::Path filename = p/name;
                if(FileTarget *tgt = get_target(filename))
                {
-                       builder.get_logger().log("vfs", format("Header %s found in %s as existing %s", name, p.str(), tgt->get_type()));
+                       builder.get_logger().log("vfs", "Header %s found in %s as existing %s", name, p.str(), tgt->get_type());
                        return tgt;
                }
                else if(file_exists(filename))
                {
-                       builder.get_logger().log("vfs", format("Header %s found in %s", name, p.str()));
+                       builder.get_logger().log("vfs", "Header %s found in %s", name, p.str());
                        return dynamic_cast<FileTarget *>(tool->create_source(filename));
                }
 
-               builder.get_logger().log("vfs", format("Header %s not found in %s", name, p.str()));
+               builder.get_logger().log("vfs", "Header %s not found in %s", name, p.str());
        }
 
        return 0;
@@ -105,12 +105,12 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
                        FS::Path filename = p / *j;
                        if(FileTarget *tgt = get_target(filename))
                        {
-                               builder.get_logger().log("vfs", format("Library %s (%s) found in %s as existing %s", lib, *j, p.str(), tgt->get_type()));
+                               builder.get_logger().log("vfs", "Library %s (%s) found in %s as existing %s", lib, *j, p.str(), tgt->get_type());
                                return tgt;
                        }
                        else if(file_exists(filename))
                        {
-                               builder.get_logger().log("vfs", format("Library %s (%s) found in %s", lib, *j, p.str()));
+                               builder.get_logger().log("vfs", "Library %s (%s) found in %s", lib, *j, p.str());
                                if(cur_names==&shared_names)
                                {
                                        if(use_import_lib)
@@ -133,7 +133,7 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
                        }
                }
 
-               builder.get_logger().log("vfs", format("Library %s not found in %s", lib, p.str()));
+               builder.get_logger().log("vfs", "Library %s not found in %s", lib, p.str());
        }
 
        return 0;
@@ -168,16 +168,16 @@ FileTarget *VirtualFileSystem::find_binary(const string &name)
                FS::Path filename = p/name;
                if(FileTarget *tgt = get_target(filename))
                {
-                       builder.get_logger().log("vfs", format("Binary %s found in %s as existing %s", name, p, tgt->get_type()));
+                       builder.get_logger().log("vfs", "Binary %s found in %s as existing %s", name, p, tgt->get_type());
                        return tgt;
                }
                else if(file_exists(filename))
                {
-                       builder.get_logger().log("vfs", format("Binary %s found in %s", name, p));
+                       builder.get_logger().log("vfs", "Binary %s found in %s", name, p);
                        return new Executable(builder, filename);
                }
 
-               builder.get_logger().log("vfs", format("Binary %s not found in %s", name, p));
+               builder.get_logger().log("vfs", "Binary %s not found in %s", name, p);
        }
 
        return 0;