oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Partition, ...: use libfmt for logging

Browse Source
This commit is contained in:
Max Kellermann
2021-06-24 20:22:48 +02:00
parent 0185d58a2b
commit 6f539cfcd6
44 changed files with 320 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/fs/Charset.cxx
View File

@@ -48,8 +48,8 @@ SetFSCharset(const char *charset)
fs_converter = IcuConverter::Create(charset);
assert(fs_converter != nullptr);
FormatDebug(path_domain,
"SetFSCharset: fs charset is: %s", fs_charset.c_str());
FmtDebug(path_domain,
"SetFSCharset: fs charset is {}", fs_charset);
}
#endif

16
src/fs/CheckFile.cxx
View File

@@ -19,6 +19,7 @@
#include "CheckFile.hxx"
#include "Log.hxx"
#include "lib/fmt/PathFormatter.hxx"
#include "config/Domain.hxx"
#include "FileInfo.hxx"
#include "Path.hxx"
@@ -31,8 +32,7 @@ CheckDirectoryReadable(Path path_fs)
try {
const FileInfo fi(path_fs);
if (!fi.IsDirectory()) {
FormatError(config_domain,
"Not a directory: %s", path_fs.ToUTF8().c_str());
FmtError(config_domain, "Not a directory: {}", path_fs);
return;
}
@@ -42,9 +42,9 @@ try {
const FileInfo fi2(x);
} catch (const std::system_error &e) {
if (IsAccessDenied(e))
FormatError(config_domain,
"No permission to traverse (\"execute\") directory: %s",
path_fs.ToUTF8().c_str());
FmtError(config_domain,
"No permission to traverse (\"execute\") directory: {}",
path_fs);
}
#endif
@@ -52,9 +52,9 @@ try {
const DirectoryReader reader(path_fs);
} catch (const std::system_error &e) {
if (IsAccessDenied(e))
FormatError(config_domain,
"No permission to read directory: %s",
path_fs.ToUTF8().c_str());
FmtError(config_domain,
"No permission to read directory: {}",
path_fs);
}
} catch (...) {
LogError(std::current_exception());