Attachment 114003 Details for Bug 89428 – dbus-monitor: use _dbus_get_real_time instead of gettimeofday

[patch] dbus-monitor: use _dbus_get_real_time instead of gettimeofday

0001-dbus-monitor-use-_dbus_get_real_time-instead-of-gett.patch (text/plain), 1.76 KB, created by Simon McVittie on 2015-03-04 18:53:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2015-03-04 18:53:11 UTC

Size: 1.76 KB

patch

obsolete

>From f27761c2887fe30dbf69aa9907262528006bd97b Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 4 Mar 2015 12:10:17 +0000
>Subject: [PATCH 1/2] dbus-monitor: use _dbus_get_real_time instead of
> gettimeofday
>
>gettimeofday is implicitly declared (i.e. not in our #include'd header
>files) when cross-compiling for on Windows. Now that fd.o#83115
>has been fixed, using _dbus functions is not a problem.
>---
> tools/dbus-monitor.c | 14 ++++----------
> 1 file changed, 4 insertions(+), 10 deletions(-)
>
>diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c
>index 0aea2e7..9cec0a7 100644
>--- a/tools/dbus-monitor.c
>+++ b/tools/dbus-monitor.c
>@@ -218,7 +218,7 @@ binary_filter_func (DBusConnection *connection,
>     {
>       case BINARY_MODE_PCAP:
>           {
>-            struct timeval t = { 0, 0 };
>+            long tv_sec, tv_usec;
>             /* seconds, microseconds, bytes captured (possibly truncated),
>              * original length.
>              * http://wiki.wireshark.org/Development/LibpcapFileFormat
>@@ -228,15 +228,9 @@ binary_filter_func (DBusConnection *connection,
>             /* If this gets padded then we'd need to write it out in pieces */
>             _DBUS_STATIC_ASSERT (sizeof (header) == 16);
> 
>-            if (_DBUS_UNLIKELY (gettimeofday (&t, NULL) < 0))
>-              {
>-                /* I'm fairly sure this can't actually happen */
>-                perror ("dbus-monitor: gettimeofday");
>-                exit (1);
>-              }
>-
>-            header[0] = t.tv_sec;
>-            header[1] = t.tv_usec;
>+            _dbus_get_real_time (&tv_sec, &tv_usec);
>+            header[0] = tv_sec;
>+            header[1] = tv_usec;
> 
>             if (!tool_write_all (STDOUT_FILENO, header, sizeof (header)))
>               {
>-- 
>2.1.4
>

Actions: View | Splinter Review

Attachments on bug 89428: 114003 | 114004

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.