osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

erf: Use g_get_real_time() to get real time 

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 <stig@bjorlykke.org>
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Stig Bjørlykke 2019-09-07 12:20:54 +02:00 committed by Anders Broman
parent aa3c5087d9
commit 241967f46e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wiretap/erf.c
View File

@ -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;
}