monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 00:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4069

Browse source 
49dc78d util: fix mistakes made in #3994 (stoffu)
This commit is contained in:
luigi1111 2018-06-27 21:25:00 -05:00
commit 65c09beaf7
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/util.cpp
View file

@ -226,19 +226,19 @@ namespace tools
MERROR("Failed to open " << filename << ": " << std::error_code(GetLastError(), std::system_category())); MERROR("Failed to open " << filename << ": " << std::error_code(GetLastError(), std::system_category()));
} }
#else #else
m_fd = open(filename, O_RDONLY | O_CREAT, 0666); m_fd = open(filename.c_str(), O_RDONLY | O_CREAT, 0666);
if (m_fd != -1) if (m_fd != -1)
{ {
if (flock(m_fd, LOCK_EX | LOCK_NB) == -1) if (flock(m_fd, LOCK_EX | LOCK_NB) == -1)
{ {
MERROR("Failed to lock " << filename << ": " << std::strerr(errno)); MERROR("Failed to lock " << filename << ": " << std::strerror(errno));
close(m_fd); close(m_fd);
m_fd = -1; m_fd = -1;
} }
} }
else else
{ {
MERROR("Failed to open " << filename << ": " << std::strerr(errno)); MERROR("Failed to open " << filename << ": " << std::strerror(errno));
} }
#endif #endif
} }