lib/fmt: remove even more now-broken uses of FMT_STRING
MPD stopped building since fmt 11.1.0; see <https://github.com/fmtlib/fmt/issues/4304>. The first commit fixing this was9db7144, followed by5de0909(both on the unstable branch). This commit removes what the author believes to be the remaining uses in the MPD codebase.
This commit is contained in:
@@ -38,10 +38,10 @@ storage_state_save(BufferedOutputStream &os, const Instance &instance)
|
||||
if (uri.empty() || StringIsEmpty(mount_uri))
|
||||
return;
|
||||
|
||||
os.Fmt(FMT_STRING(MOUNT_STATE_BEGIN "\n"
|
||||
MOUNT_STATE_STORAGE_URI "{}\n"
|
||||
MOUNT_STATE_MOUNTED_URL "{}\n"
|
||||
MOUNT_STATE_END "\n"),
|
||||
os.Fmt(MOUNT_STATE_BEGIN "\n"
|
||||
MOUNT_STATE_STORAGE_URI "{}\n"
|
||||
MOUNT_STATE_MOUNTED_URL "{}\n"
|
||||
MOUNT_STATE_END "\n",
|
||||
mount_uri, uri);
|
||||
};
|
||||
|
||||
@@ -80,7 +80,7 @@ storage_state_restore(const char *line, LineReader &file,
|
||||
return true;
|
||||
|
||||
if (url.empty() || uri.empty()) {
|
||||
LogError(storage_domain, "Missing value in mountpoint state.");
|
||||
LogError(storage_domain, "Missing value in mountpoint state.");
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user