LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages 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
commit cf5ebaa921
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
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

@ -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
View file

@ -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);