From 241967f46e5d0692513ae4f170939cc0ec5c4234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Sat, 7 Sep 2019 12:20:54 +0200 Subject: [PATCH] erf: Use g_get_real_time() to get real time MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use g_get_real_time() to get real time because GTimeVal and g_get_current_time() was deprecated in glib 2.62. Change-Id: I78fee34e2f5b634c91c6420b01915cfc070f38a4 Reviewed-on: https://code.wireshark.org/review/34468 Reviewed-by: Stig Bjørlykke Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- wiretap/erf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wiretap/erf.c b/wiretap/erf.c index 267932e599..4ae82a0e3c 100644 --- a/wiretap/erf.c +++ b/wiretap/erf.c @@ -971,11 +971,11 @@ static gboolean erf_write_phdr(wtap_dumper *wdh, int encap, const union wtap_pse static void erf_dump_priv_init_gen_time(erf_dump_t *dump_priv) { - GTimeVal real_time; + gint64 real_time; - g_get_current_time(&real_time); + real_time = g_get_real_time(); /* Convert TimeVal to ERF timestamp */ - dump_priv->gen_time = ((guint64) real_time.tv_sec << 32) + ((guint64) real_time.tv_usec << 32) / 1000 / 1000; + dump_priv->gen_time = ((real_time / G_USEC_PER_SEC) << 32) + ((real_time % G_USEC_PER_SEC) << 32) / 1000 / 1000; }