summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott James Remnant <scott@ubuntu.com>2009-05-11 22:42:13 +0100
committerScott James Remnant <scott@ubuntu.com>2009-05-28 11:47:34 +0200
commit7398ad7374c0a9201d41397c956deee325f3593e (patch)
tree814f05a8f64c59396c516ff10fbc314aeb588dd1
parent1faa92114f6489d286ad4cebe5e91b2145a4f7d1 (diff)
downloaddbus-7398ad7374c0a9201d41397c956deee325f3593e.tar.gz
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>
-rw-r--r--dbus/dbus-pending-call.c7
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 (&notify_user_data_slot))
return NULL;