From 63e4fc74bd884c5f350e58c81e928cdcd90309fe Mon Sep 17 00:00:00 2001 From: Tomas Mlcoch Date: Tue, 10 Jun 2014 15:19:38 +0200 Subject: [PATCH] misc: Remove use of g_date_time_* functions --- src/misc.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/misc.c b/src/misc.c index 61065e4..1184a8f 100644 --- a/src/misc.c +++ b/src/misc.c @@ -20,17 +20,18 @@ #define _XOPEN_SOURCE 500 #include +#include #include +#include #include +#include +#include #include -#include #include -#include -#include -#include +#include +#include #include -#include -#include +#include #include "error.h" #include "misc.h" @@ -1236,16 +1237,19 @@ cr_rm(const char *path, gchar * cr_append_pid_and_datetime(const char *str, const char *suffix) { - GDateTime *cur_datetime = g_date_time_new_now_local(); - gchar *datetime = g_date_time_format(cur_datetime, "%Y%m%d%H%M%S"); - gchar *result = g_strdup_printf("%s%jd.%s.%d%s", + struct tm * timeinfo; + struct timeval tv; + char datetime[80]; + + gettimeofday(&tv, NULL); + timeinfo = localtime (&(tv.tv_sec)); + strftime(datetime, 80, "%Y%m%d%H%M%S", timeinfo); + gchar *result = g_strdup_printf("%s%jd.%s.%ld%s", str ? str : "", (intmax_t) getpid(), datetime, - g_date_time_get_microsecond(cur_datetime), + tv.tv_usec, suffix ? suffix : ""); - g_free(datetime); - g_date_time_unref(cur_datetime); return result; } -- 2.7.4