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

client/Response, command/file: use %lu instead of %zu on Windows

Browse Source 
Fixes -Wformat warnings.

Closes https://github.com/MusicPlayerDaemon/MPD/issues/1150
This commit is contained in:
Max Kellermann 2021-05-19 18:04:55 +02:00
parent bcf0fdd3a8
commit 6de4064cca
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/client/Response.cxx
View File

@ -61,7 +61,12 @@ Response::WriteBinary(ConstBuffer<void> payload) noexcept
{ {
assert(payload.size <= client.binary_limit); assert(payload.size <= client.binary_limit);
return Format("binary: %zu\n", payload.size) && return
#ifdef _WIN32
Format("binary: %lu\n", (unsigned long)payload.size) &&
#else
Format("binary: %zu\n", payload.size) &&
#endif
Write(payload.data, payload.size) && Write(payload.data, payload.size) &&
Write("\n"); Write("\n");
} }

9
src/command/FileCommands.cxx
View File

@ -231,7 +231,12 @@ read_stream_art(Response &r, const char *uri, size_t offset)
read_size = is->Read(lock, buffer.get(), buffer_size); read_size = is->Read(lock, buffer.get(), buffer_size);
} }
#ifdef _WIN32
r.Format("size: %lu\n", (unsigned long)art_file_size);
#else
r.Format("size: %" PRIoffset "\n", art_file_size); r.Format("size: %" PRIoffset "\n", art_file_size);
#endif
r.WriteBinary({buffer.get(), read_size}); r.WriteBinary({buffer.get(), read_size});
return CommandResult::OK; return CommandResult::OK;
@ -313,7 +318,11 @@ public:
return; return;
} }
#ifdef _WIN32
response.Format("size: %lu\n", (unsigned long)buffer.size);
#else
response.Format("size: %zu\n", buffer.size); response.Format("size: %zu\n", buffer.size);
#endif
if (mime_type != nullptr) if (mime_type != nullptr)
response.Format("type: %s\n", mime_type); response.Format("type: %s\n", mime_type);