aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Janík <Pavel@Janik.cz>2016-09-02 20:50:59 +0200
committerPavel Janík <Pavel@Janik.cz>2016-09-02 20:50:59 +0200
commit7c069a70931a6bb27d060927765146d4c6ceced4 (patch)
tree377fb513d210da211f92345c6972c90a50e3cb92
parentcbe9ae8c69b947c8cdff2e0fbf5b57c9aa09b770 (diff)
Do not shadow global variable
-rw-r--r--src/util.cpp12
-rw-r--r--src/util.h2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/util.cpp b/src/util.cpp
index ee12f2b443..fe37f5e753 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -601,19 +601,19 @@ bool TryCreateDirectory(const boost::filesystem::path& p)
return false;
}
-void FileCommit(FILE *fileout)
+void FileCommit(FILE *file)
{
- fflush(fileout); // harmless if redundantly called
+ fflush(file); // harmless if redundantly called
#ifdef WIN32
- HANDLE hFile = (HANDLE)_get_osfhandle(_fileno(fileout));
+ HANDLE hFile = (HANDLE)_get_osfhandle(_fileno(file));
FlushFileBuffers(hFile);
#else
#if defined(__linux__) || defined(__NetBSD__)
- fdatasync(fileno(fileout));
+ fdatasync(fileno(file));
#elif defined(__APPLE__) && defined(F_FULLFSYNC)
- fcntl(fileno(fileout), F_FULLFSYNC, 0);
+ fcntl(fileno(file), F_FULLFSYNC, 0);
#else
- fsync(fileno(fileout));
+ fsync(fileno(file));
#endif
#endif
}
diff --git a/src/util.h b/src/util.h
index 39328b51ef..45b3658557 100644
--- a/src/util.h
+++ b/src/util.h
@@ -93,7 +93,7 @@ bool error(const char* fmt, const Args&... args)
void PrintExceptionContinue(const std::exception *pex, const char* pszThread);
void ParseParameters(int argc, const char*const argv[]);
-void FileCommit(FILE *fileout);
+void FileCommit(FILE *file);
bool TruncateFile(FILE *file, unsigned int length);
int RaiseFileDescriptorLimit(int nMinFD);
void AllocateFileRange(FILE *file, unsigned int offset, unsigned int length);