mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libfreerdp-utils: remove old time utils

Browse Source
This commit is contained in:
Marc-André Moreau 2014-11-12 13:45:03 -05:00
parent 986dae429b
commit 8c98cbc247
4 changed files with 18 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
include/freerdp/utils/time.h
View File

@ -1,45 +0,0 @@
/**
* FreeRDP: A Remote Desktop Protocol Implementation
* Time Utils
*
* Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef FREERDP_UTILS_TIME_H
#define FREERDP_UTILS_TIME_H
#define __USE_XOPEN
#include <time.h>
#ifndef _WIN32
#include <unistd.h>
#endif
#include <freerdp/api.h>
#include <freerdp/types.h>
#ifdef __cplusplus
extern "C" {
#endif
FREERDP_API UINT64 freerdp_windows_gmtime(void);
FREERDP_API UINT64 freerdp_get_windows_time_from_unix_time(time_t unix_time);
FREERDP_API time_t freerdp_get_unix_time_from_windows_time(UINT64 windows_time);
#ifdef __cplusplus
}
#endif
#endif /* FREERDP_TIME_UTILS_H */

24
libfreerdp/locale/timezone.c
View File

@ -21,17 +21,18 @@
#include "config.h"
#endif
#include <time.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <winpr/crt.h>
#define __USE_XOPEN
#include <time.h>
#ifndef _WIN32
#include <unistd.h>
#endif
#include "liblocale.h"
#include <freerdp/log.h>
#include <freerdp/utils/time.h>
#include <freerdp/locale/timezone.h>
#define TAG FREERDP_TAG("locale")
@ -1491,6 +1492,17 @@ const WINDOWS_TZID_ENTRY WindowsTimeZoneIdTable[] =
{ "Yakutsk Standard Time", "Asia/Yakutsk" }
};
static UINT64 freerdp_windows_gmtime()
{
time_t unix_time;
UINT64 windows_time;
time(&unix_time);
windows_time = ((UINT64) unix_time * 10000000) + 621355968000000000ULL;
return windows_time;
}
char* freerdp_get_unix_timezone_identifier()
{
#ifndef _WIN32

1
libfreerdp/utils/CMakeLists.txt
View File

@ -26,7 +26,6 @@ set(${MODULE_PREFIX}_SRCS
signal.c
stopwatch.c
tcp.c
time.c
uds.c)
if(NOT WIN32)

55
libfreerdp/utils/time.c
View File

@ -1,55 +0,0 @@
/**
* FreeRDP: A Remote Desktop Protocol Implementation
* Time Utils
*
* Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <winpr/windows.h>
#include <freerdp/utils/time.h>
UINT64 freerdp_windows_gmtime()
{
time_t unix_time;
UINT64 windows_time;
time(&unix_time);
windows_time = freerdp_get_windows_time_from_unix_time(unix_time);
return windows_time;
}
UINT64 freerdp_get_windows_time_from_unix_time(time_t unix_time)
{
UINT64 windows_time;
windows_time = ((UINT64)unix_time * 10000000) + 621355968000000000ULL;
return windows_time;
}
time_t freerdp_get_unix_time_from_windows_time(UINT64 windows_time)
{
time_t unix_time;
unix_time = (windows_time - 621355968000000000ULL) / 10000000;
return unix_time;
}