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

command/{storage,file}: suppress bogus format warnings on WIN32

Browse Source
This commit is contained in:
Max Kellermann 2014-03-14 08:58:43 +01:00
parent f2f1801c25
commit 88eae9dabb
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/command/FileCommands.cxx
View File

@ -59,6 +59,13 @@ skip_path(const char *name_fs)
return strchr(name_fs, '\n') != nullptr; return strchr(name_fs, '\n') != nullptr;
} }
#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
/* PRIu64 causes bogus compiler warning */
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat"
#pragma GCC diagnostic ignored "-Wformat-extra-args"
#endif
CommandResult CommandResult
handle_listfiles_local(Client &client, const char *path_utf8) handle_listfiles_local(Client &client, const char *path_utf8)
{ {
@ -109,6 +116,10 @@ handle_listfiles_local(Client &client, const char *path_utf8)
return CommandResult::OK; return CommandResult::OK;
} }
#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
#pragma GCC diagnostic pop
#endif
gcc_pure gcc_pure
static bool static bool
IsValidName(const char *p) IsValidName(const char *p)

11
src/command/StorageCommands.cxx
View File

@ -46,6 +46,13 @@ skip_path(const char *name_utf8)
return strchr(name_utf8, '\n') != nullptr; return strchr(name_utf8, '\n') != nullptr;
} }
#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
/* PRIu64 causes bogus compiler warning */
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat"
#pragma GCC diagnostic ignored "-Wformat-extra-args"
#endif
static bool static bool
handle_listfiles_storage(Client &client, StorageDirectoryReader &reader, handle_listfiles_storage(Client &client, StorageDirectoryReader &reader,
Error &error) Error &error)
@ -83,6 +90,10 @@ handle_listfiles_storage(Client &client, StorageDirectoryReader &reader,
return true; return true;
} }
#if defined(WIN32) && GCC_CHECK_VERSION(4,6)
#pragma GCC diagnostic pop
#endif
static bool static bool
handle_listfiles_storage(Client &client, Storage &storage, const char *uri, handle_listfiles_storage(Client &client, Storage &storage, const char *uri,
Error &error) Error &error)