Attachment 56869 Details for Bug 39759 – [1/3] _dbus_list_pop_last_link: remove, unused

[patch] [1/3] _dbus_list_pop_last_link: remove, unused

0001-_dbus_list_pop_last_link-remove-unused.patch (text/plain), 2.84 KB, created by Simon McVittie on 2012-02-10 07:01:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-02-10 07:01:21 UTC

Size: 2.84 KB

patch

obsolete

>From 12912c13a45183e839c95e28d30d022d6880ae2f Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Fri, 10 Feb 2012 14:32:01 +0000
>Subject: [PATCH 1/3] _dbus_list_pop_last_link: remove, unused
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39759
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> dbus/dbus-list.c |   35 ++++++-----------------------------
> dbus/dbus-list.h |    1 -
> 2 files changed, 6 insertions(+), 30 deletions(-)
>
>diff --git a/dbus/dbus-list.c b/dbus/dbus-list.c
>index f8f1c4a..7e11cc8 100644
>--- a/dbus/dbus-list.c
>+++ b/dbus/dbus-list.c
>@@ -673,29 +673,6 @@ _dbus_list_pop_last (DBusList **list)
>   return data;
> }
> 
>-#ifdef DBUS_BUILD_TESTS
>-/**
>- * Removes the last link in the list and returns it.  This is a
>- * constant-time operation.
>- *
>- * @param list address of the list head.
>- * @returns the last link in the list, or #NULL for an empty list.
>- */
>-DBusList*
>-_dbus_list_pop_last_link (DBusList **list)
>-{
>-  DBusList *link;
>-  
>-  link = _dbus_list_get_last_link (list);
>-  if (link == NULL)
>-    return NULL;
>-
>-  _dbus_list_unlink (list, link);
>-
>-  return link;
>-}
>-#endif /* DBUS_BUILD_TESTS */
>-
> /**
>  * Copies a list. This is a linear-time operation.  If there isn't
>  * enough memory to copy the entire list, the destination list will be
>@@ -1057,25 +1034,25 @@ _dbus_list_test (void)
>       DBusList *got_link1;
>       DBusList *got_link2;
> 
>-      DBusList *link1;
>       DBusList *link2;
>       
>+      void *data1_indirect;
>       void *data1;
>       void *data2;
>       
>       got_link1 = _dbus_list_get_last_link (&list1);
>       got_link2 = _dbus_list_get_first_link (&list2);
>-      
>-      link1 = _dbus_list_pop_last_link (&list1);
>+
>       link2 = _dbus_list_pop_first_link (&list2);
> 
>-      _dbus_assert (got_link1 == link1);
>       _dbus_assert (got_link2 == link2);
> 
>-      data1 = link1->data;
>+      data1_indirect = got_link1->data;
>+      /* this call makes got_link1 invalid */
>+      data1 = _dbus_list_pop_last (&list1);
>+      _dbus_assert (data1 == data1_indirect);
>       data2 = link2->data;
> 
>-      _dbus_list_free_link (link1);
>       _dbus_list_free_link (link2);
>       
>       _dbus_assert (_DBUS_POINTER_TO_INT (data1) == i);
>diff --git a/dbus/dbus-list.h b/dbus/dbus-list.h
>index 2e346d5..910d738 100644
>--- a/dbus/dbus-list.h
>+++ b/dbus/dbus-list.h
>@@ -69,7 +69,6 @@ void*       _dbus_list_get_first          (DBusList **list);
> void*       _dbus_list_pop_first          (DBusList **list);
> void*       _dbus_list_pop_last           (DBusList **list);
> DBusList*   _dbus_list_pop_first_link     (DBusList **list);
>-DBusList*   _dbus_list_pop_last_link      (DBusList **list);
> dbus_bool_t _dbus_list_copy               (DBusList **list,
>                                            DBusList **dest);
> int         _dbus_list_get_length         (DBusList **list);
>-- 
>1.7.9
>

Actions: View | Splinter Review

Attachments on bug 39759: 49828 | 49829 | 49830 | 49831 | 49832 | 49833 | 49834 | 49835 | 49836 | 56869 | 56870 | 56871

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.