mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2024-11-15 16:35:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed private members of file_helper

Browse Source
This commit is contained in:
gabime 2019-10-25 16:04:07 +03:00
parent dbe5c17a96
commit a4602021d8
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/spdlog/details/file_helper-inl.h
View File

@ -30,9 +30,9 @@ SPDLOG_INLINE void file_helper::open(const filename_t &fname, bool truncate)
close(); close();
auto *mode = truncate ? SPDLOG_FILENAME_T("wb") : SPDLOG_FILENAME_T("ab"); auto *mode = truncate ? SPDLOG_FILENAME_T("wb") : SPDLOG_FILENAME_T("ab");
auto folder_name = os::dir_name(fname); auto folder_name = os::dir_name(fname);
_filename = fname; filename_ = fname;
for (int tries = 0; tries < open_tries; ++tries) for (int tries = 0; tries < open_tries_; ++tries)
{ {
if (!folder_name.empty()) if (!folder_name.empty())
{ {
@ -44,19 +44,19 @@ SPDLOG_INLINE void file_helper::open(const filename_t &fname, bool truncate)
return; return;
} }
details::os::sleep_for_millis(open_interval); details::os::sleep_for_millis(open_interval_);
} }
SPDLOG_THROW(spdlog_ex("Failed opening file " + os::filename_to_str(_filename) + " for writing", errno)); SPDLOG_THROW(spdlog_ex("Failed opening file " + os::filename_to_str(filename_) + " for writing", errno));
} }
SPDLOG_INLINE void file_helper::reopen(bool truncate) SPDLOG_INLINE void file_helper::reopen(bool truncate)
{ {
if (_filename.empty()) if (filename_.empty())
{ {
SPDLOG_THROW(spdlog_ex("Failed re opening file - was not opened before")); SPDLOG_THROW(spdlog_ex("Failed re opening file - was not opened before"));
} }
open(_filename, truncate); this->open(filename_, truncate);
} }
SPDLOG_INLINE void file_helper::flush() SPDLOG_INLINE void file_helper::flush()
@ -79,7 +79,7 @@ SPDLOG_INLINE void file_helper::write(const memory_buf_t &buf)
auto data = buf.data(); auto data = buf.data();
if (std::fwrite(data, 1, msg_size, fd_) != msg_size) if (std::fwrite(data, 1, msg_size, fd_) != msg_size)
{ {
SPDLOG_THROW(spdlog_ex("Failed writing to file " + os::filename_to_str(_filename), errno)); SPDLOG_THROW(spdlog_ex("Failed writing to file " + os::filename_to_str(filename_), errno));
} }
} }
@ -87,14 +87,14 @@ SPDLOG_INLINE size_t file_helper::size() const
{ {
if (fd_ == nullptr) if (fd_ == nullptr)
{ {
SPDLOG_THROW(spdlog_ex("Cannot use size() on closed file " + os::filename_to_str(_filename))); SPDLOG_THROW(spdlog_ex("Cannot use size() on closed file " + os::filename_to_str(filename_)));
} }
return os::filesize(fd_); return os::filesize(fd_);
} }
SPDLOG_INLINE const filename_t &file_helper::filename() const SPDLOG_INLINE const filename_t &file_helper::filename() const
{ {
return _filename; return filename_;
} }
// //

6
include/spdlog/details/file_helper.h
View File

@ -46,10 +46,10 @@ public:
static std::tuple<filename_t, filename_t> split_by_extension(const filename_t &fname); static std::tuple<filename_t, filename_t> split_by_extension(const filename_t &fname);
private: private:
const int open_tries = 5; const int open_tries_ = 5;
const int open_interval = 10; const int open_interval_ = 10;
std::FILE *fd_{nullptr}; std::FILE *fd_{nullptr};
filename_t _filename; filename_t filename_;
}; };
} // namespace details } // namespace details
} // namespace spdlog } // namespace spdlog