time/Convert: move GetTimeZoneOffset() to Zone.cxx
This commit is contained in:
Max Kellermann
committed by
Max Kellermann
Max Kellermann
parent
11d24a583d
commit
af3a625f64
@@ -31,6 +31,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "Convert.hxx"
|
#include "Convert.hxx"
|
||||||
|
#include "Zone.hxx"
|
||||||
|
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
|
||||||
@@ -72,29 +73,6 @@ LocalTime(std::chrono::system_clock::time_point tp)
|
|||||||
return *tm;
|
return *tm;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef __GLIBC__
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine the time zone offset in a portable way.
|
|
||||||
*/
|
|
||||||
[[gnu::const]]
|
|
||||||
static time_t
|
|
||||||
GetTimeZoneOffset() noexcept
|
|
||||||
{
|
|
||||||
time_t t = 1234567890;
|
|
||||||
#ifdef _WIN32
|
|
||||||
struct tm *p = gmtime(&t);
|
|
||||||
#else
|
|
||||||
struct tm tm;
|
|
||||||
tm.tm_isdst = 0;
|
|
||||||
struct tm *p = &tm;
|
|
||||||
gmtime_r(&t, p);
|
|
||||||
#endif
|
|
||||||
return t - mktime(p);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* !__GLIBC__ */
|
|
||||||
|
|
||||||
std::chrono::system_clock::time_point
|
std::chrono::system_clock::time_point
|
||||||
TimeGm(struct tm &tm) noexcept
|
TimeGm(struct tm &tm) noexcept
|
||||||
{
|
{
|
||||||
|
|||||||
50
src/time/Zone.cxx
Normal file
50
src/time/Zone.cxx
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2007-2022 CM4all GmbH
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* author: Max Kellermann <mk@cm4all.com>
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
* are met:
|
||||||
|
*
|
||||||
|
* - Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* - Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the
|
||||||
|
* distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||||
|
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||||
|
* FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||||
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
|
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||||
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||||
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||||
|
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "Zone.hxx"
|
||||||
|
|
||||||
|
#include <time.h>
|
||||||
|
|
||||||
|
int
|
||||||
|
GetTimeZoneOffset() noexcept
|
||||||
|
{
|
||||||
|
time_t t = 1234567890;
|
||||||
|
#ifdef _WIN32
|
||||||
|
struct tm *p = gmtime(&t);
|
||||||
|
#else
|
||||||
|
struct tm tm;
|
||||||
|
tm.tm_isdst = 0;
|
||||||
|
struct tm *p = &tm;
|
||||||
|
gmtime_r(&t, p);
|
||||||
|
#endif
|
||||||
|
return t - mktime(p);
|
||||||
|
}
|
||||||
40
src/time/Zone.hxx
Normal file
40
src/time/Zone.hxx
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2007-2022 CM4all GmbH
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* author: Max Kellermann <mk@cm4all.com>
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
* are met:
|
||||||
|
*
|
||||||
|
* - Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* - Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the
|
||||||
|
* distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
||||||
|
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||||
|
* FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
||||||
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
|
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||||
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||||
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||||
|
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determine the time zone offset in a portable way.
|
||||||
|
*/
|
||||||
|
[[gnu::const]]
|
||||||
|
int
|
||||||
|
GetTimeZoneOffset() noexcept;
|
||||||
@@ -4,6 +4,7 @@ time = static_library(
|
|||||||
'Convert.cxx',
|
'Convert.cxx',
|
||||||
'ISO8601.cxx',
|
'ISO8601.cxx',
|
||||||
'Math.cxx',
|
'Math.cxx',
|
||||||
|
'Zone.cxx',
|
||||||
include_directories: inc,
|
include_directories: inc,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user