diff options
| author | Scott James Remnant <scott@ubuntu.com> | 2009-05-11 22:42:13 +0100 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2009-07-14 15:38:02 -0400 |
| commit | 5de455c0bbbb5dfbb651ad88140f14aac99d4e2f (patch) | |
| tree | 4fac5735c7e2567e54dfe5f49985df02f7461a26 | |
| parent | fc7b4fc9ecf26d60384ad3fd3551f3de53fc91e6 (diff) | |
Remove 6 hour timeout restriction.
* dbus/dbus-pending-call.c (_dbus_pending_call_new_unlocked): Now that
the timeout math won't overflow, don't clamp to six hours.
Signed-off-by: Scott James Remnant <scott@ubuntu.com>
(cherry picked from commit 7398ad7374c0a9201d41397c956deee325f3593e)
| -rw-r--r-- | dbus/dbus-pending-call.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c index 8e840f06..15564aad 100644 --- a/dbus/dbus-pending-call.c +++ b/dbus/dbus-pending-call.c @@ -100,13 +100,6 @@ _dbus_pending_call_new_unlocked (DBusConnection *connection, if (timeout_milliseconds == -1) timeout_milliseconds = _DBUS_DEFAULT_TIMEOUT_VALUE; - /* clamp the timeout otherwise math in - * _dbus_connection_block_for_reply would get all overflow-prone - */ - if ((timeout_milliseconds > _DBUS_ONE_HOUR_IN_MILLISECONDS * 6) && - (timeout_milliseconds < _DBUS_INT_MAX)) - timeout_milliseconds = _DBUS_ONE_HOUR_IN_MILLISECONDS * 6; - if (!dbus_pending_call_allocate_data_slot (¬ify_user_data_slot)) return NULL; |