summaryrefslogtreecommitdiffstats
path: root/src/OSSupport
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2020-05-04 20:21:48 +0200
committerTiger Wang <ziwei.tiger@outlook.com>2020-07-23 01:32:47 +0200
commit330626ab22fe2e87afa5306c5f4039088c41b49e (patch)
tree86a5c7e0f0eb34743d186cbd712d368fed16f748 /src/OSSupport
parentRemove some unused inclusions (diff)
downloadcuberite-330626ab22fe2e87afa5306c5f4039088c41b49e.tar
cuberite-330626ab22fe2e87afa5306c5f4039088c41b49e.tar.gz
cuberite-330626ab22fe2e87afa5306c5f4039088c41b49e.tar.bz2
cuberite-330626ab22fe2e87afa5306c5f4039088c41b49e.tar.lz
cuberite-330626ab22fe2e87afa5306c5f4039088c41b49e.tar.xz
cuberite-330626ab22fe2e87afa5306c5f4039088c41b49e.tar.zst
cuberite-330626ab22fe2e87afa5306c5f4039088c41b49e.zip
Diffstat (limited to 'src/OSSupport')
-rw-r--r--src/OSSupport/File.cpp8
-rw-r--r--src/OSSupport/File.h6
2 files changed, 5 insertions, 9 deletions
diff --git a/src/OSSupport/File.cpp b/src/OSSupport/File.cpp
index 2d26c3cd6..f860c37ca 100644
--- a/src/OSSupport/File.cpp
+++ b/src/OSSupport/File.cpp
@@ -695,10 +695,10 @@ AString cFile::GetExecutableExt(void)
-int cFile::vPrintf(const char * a_Fmt, fmt::printf_args a_ArgList)
+int cFile::vPrintf(const char * a_Format, fmt::printf_args a_ArgList)
{
fmt::memory_buffer Buffer;
- fmt::vprintf(Buffer, fmt::to_string_view(a_Fmt), a_ArgList);
+ fmt::vprintf(Buffer, fmt::to_string_view(a_Format), a_ArgList);
return Write(Buffer.data(), Buffer.size());
}
@@ -710,7 +710,3 @@ void cFile::Flush(void)
{
fflush(m_File);
}
-
-
-
-
diff --git a/src/OSSupport/File.h b/src/OSSupport/File.h
index 689900816..9987c41c7 100644
--- a/src/OSSupport/File.h
+++ b/src/OSSupport/File.h
@@ -168,11 +168,11 @@ public:
/** Returns the list of all items in the specified folder (files, folders, nix pipes, whatever's there). */
static AStringVector GetFolderContents(const AString & a_Folder); // Exported in ManualBindings.cpp
- int vPrintf(const char * a_Fmt, fmt::printf_args);
+ int vPrintf(const char * a_Format, fmt::printf_args a_ArgList);
template <typename... Args>
- int Printf(const char * a_Fmt, const Args & ... a_Args)
+ int Printf(const char * a_Format, const Args & ... a_Args)
{
- return vPrintf(a_Fmt, fmt::make_printf_args(a_Args...));
+ return vPrintf(a_Format, fmt::make_printf_args(a_Args...));
}
/** Flushes all the bufferef output into the file (only when writing) */