sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
7c069a7 Do not shadow global variable (Pavel Janík)
This commit is contained in:
Wladimir J. van der Laan 2016-09-21 14:13:33 +02:00 committed by Alexander Block
parent bfa539a1dd
commit 97b63420dd
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/util.cpp
View File

@ -701,19 +701,19 @@ bool TryCreateDirectory(const boost::filesystem::path& p)
return false; return false;
} }
void FileCommit(FILE *fileout) void FileCommit(FILE *file)
{ {
fflush(fileout); // harmless if redundantly called fflush(file); // harmless if redundantly called
#ifdef WIN32 #ifdef WIN32
HANDLE hFile = (HANDLE)_get_osfhandle(_fileno(fileout)); HANDLE hFile = (HANDLE)_get_osfhandle(_fileno(file));
FlushFileBuffers(hFile); FlushFileBuffers(hFile);
#else #else
#if defined(__linux__) || defined(__NetBSD__) #if defined(__linux__) || defined(__NetBSD__)
fdatasync(fileno(fileout)); fdatasync(fileno(file));
#elif defined(__APPLE__) && defined(F_FULLFSYNC) #elif defined(__APPLE__) && defined(F_FULLFSYNC)
fcntl(fileno(fileout), F_FULLFSYNC, 0); fcntl(fileno(file), F_FULLFSYNC, 0);
#else #else
fsync(fileno(fileout)); fsync(fileno(file));
#endif #endif
#endif #endif
} }

2
src/util.h
View File

@ -114,7 +114,7 @@ bool error(const char* fmt, const Args&... args)
void PrintExceptionContinue(const std::exception *pex, const char* pszThread); void PrintExceptionContinue(const std::exception *pex, const char* pszThread);
void ParseParameters(int argc, const char*const argv[]); void ParseParameters(int argc, const char*const argv[]);
void FileCommit(FILE *fileout); void FileCommit(FILE *file);
bool TruncateFile(FILE *file, unsigned int length); bool TruncateFile(FILE *file, unsigned int length);
int RaiseFileDescriptorLimit(int nMinFD); int RaiseFileDescriptorLimit(int nMinFD);
void AllocateFileRange(FILE *file, unsigned int offset, unsigned int length); void AllocateFileRange(FILE *file, unsigned int offset, unsigned int length);