Attachment 17869 Details for Bug 16841 – [PATCH 8/9] Expire list timeout may be negative for no expiry.

[patch] [PATCH 8/9] Expire list timeout may be negative for no expiry.

008.patch (text/plain), 1001 bytes, created by Colin Walters on 2008-07-24 15:08:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Walters

Created: 2008-07-24 15:08:33 UTC

Size: 1001 bytes

patch

obsolete

>* bus/expirelist.c (do_expiration_with_current_time): Don't check for
>  expiry if expire_after is negative, will just disable the expiry timer
>  after the call.
>---
> bus/expirelist.c |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/bus/expirelist.c b/bus/expirelist.c
>index 038cfee..8cf1fad 100644
>--- a/bus/expirelist.c
>+++ b/bus/expirelist.c
>@@ -158,7 +158,7 @@ do_expiration_with_current_time (BusExpireList *list,
>                                             tv_sec, tv_usec);
> 
>       if (((item->added_tv_sec == 0) && (item->added_tv_usec == 0)) ||
>-		      (elapsed >= (double) list->expire_after))
>+          ((list->expire_after > 0) && (elapsed >= (double) list->expire_after)))
>         {
>           _dbus_verbose ("Expiring an item %p\n", item);
> 
>@@ -174,7 +174,7 @@ do_expiration_with_current_time (BusExpireList *list,
>               break;
>             }
>         }
>-      else
>+      else if (list->expire_after > 0)
>         {
>           double to_wait;
>

Actions: View | Splinter Review

Attachments on bug 16841: 17862 | 17863 | 17864 | 17865 | 17866 | 17867 | 17868 | 17869 | 17870 | 25769 | 25770 | 25771 | 25772 | 25773 | 25774 | 25775 | 25776 | 25777 | 25778 | 25779

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.