Browse Source

Merge #8656: Trivial: Do not shadow global variable fileout

7c069a7 Do not shadow global variable (Pavel Janík)
pull/1/head
Wladimir J. van der Laan 6 years ago
parent
commit
cf5ebaa921
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 12
      src/util.cpp
  2. 2
      src/util.h

12
src/util.cpp

@ -600,19 +600,19 @@ bool TryCreateDirectory(const boost::filesystem::path& p) @@ -600,19 +600,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
}

2
src/util.h

@ -93,7 +93,7 @@ bool error(const char* fmt, const Args&... args) @@ -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);

Loading…
Cancel
Save