Skip to content
Permalink
Browse files

Merge pull request #4069

49dc78d util: fix mistakes made in #3994 (stoffu)
  • Loading branch information...
luigi1111 committed Jun 28, 2018
2 parents 8b18401 + 49dc78d commit 65c09beaf75c43d57993a317f6448cb42b88c2bb
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/common/util.cpp
@@ -226,19 +226,19 @@ namespace tools
MERROR("Failed to open " << filename << ": " << std::error_code(GetLastError(), std::system_category()));
}
#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 (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);
m_fd = -1;
}
}
else
{
MERROR("Failed to open " << filename << ": " << std::strerr(errno));
MERROR("Failed to open " << filename << ": " << std::strerror(errno));
}
#endif
}

0 comments on commit 65c09be

Please sign in to comment.
You can’t perform that action at this time.