[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freedesktop-dbus
Subject:    [PATCH 7/9] Explicitly check for zero time fields.
From:       Scott James Remnant <scott () netsplit ! com>
Date:       2008-07-18 16:20:12
Message-ID: 20080718162012.GA19910 () bioshock ! vm ! bytemark ! co ! uk
[Download RAW message or body]

* bus/expirelist.c (do_expiration_with_current_time): If the item added
  time fields are both zero, always expire.
---
 bus/expirelist.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/bus/expirelist.c b/bus/expirelist.c
index d718d9f..038cfee 100644
--- a/bus/expirelist.c
+++ b/bus/expirelist.c
@@ -157,7 +157,8 @@ do_expiration_with_current_time (BusExpireList *list,
                                             item->added_tv_usec,
                                             tv_sec, tv_usec);
 
-      if (elapsed >= (double) list->expire_after)
+      if (((item->added_tv_sec == 0) && (item->added_tv_usec == 0)) ||
+		      (elapsed >= (double) list->expire_after))
         {
           _dbus_verbose ("Expiring an item %p\n", item);
 
-- 
1.5.4.3

_______________________________________________
dbus mailing list
dbus@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dbus
[prev in list] [next in list] [prev in thread] [next in thread]