Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-30 13:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

Merge branch 'localtime_errors' into 'master'

Browse source 
Handle localtime errors

See merge request OpenMW/openmw!2434
This commit is contained in:
psi29a 2022-09-26 07:59:41 +00:00
commit b58c658b56
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/misc/timeconvert.hpp
View file

@ -1,8 +1,15 @@
#ifndef OPENMW_COMPONENTS_MISC_TIMECONVERT_H #ifndef OPENMW_COMPONENTS_MISC_TIMECONVERT_H
#define OPENMW_COMPONENTS_MISC_TIMECONVERT_H #define OPENMW_COMPONENTS_MISC_TIMECONVERT_H
#include <cerrno>
#include <chrono> #include <chrono>
#include <cstring>
#include <ctime>
#include <filesystem>
#include <iomanip>
#include <sstream> #include <sstream>
#include <string>
#include <system_error>
namespace Misc namespace Misc
{ {
@ -22,9 +29,11 @@ namespace Misc
{ {
tm time_info{}; tm time_info{};
#ifdef _WIN32 #ifdef _WIN32
(void)localtime_s(&time_info, &tp); if (const errno_t error = localtime_s(&time_info, &tp); error != 0)
throw std::system_error(error, std::generic_category());
#else #else
(void)localtime_r(&tp, &time_info); if (localtime_r(&tp, &time_info) == nullptr)
throw std::system_error(errno, std::generic_category());
#endif #endif
std::stringstream out; std::stringstream out;
out << std::put_time(&time_info, fmt); out << std::put_time(&time_info, fmt);