2003-04-22 Havoc Pennington <hp@redhat.com>

[platform/upstream/dbus.git] / dbus / dbus-list.h

diff --git a/dbus/dbus-list.h b/dbus/dbus-list.h
index ce8956a..f3b37ef 100644 (file)
--- a/dbus/dbus-list.h
+++ b/dbus/dbus-list.h
@@ -1,7 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu" -*- */
 /* dbus-list.h Generic linked list utility (internal to D-BUS implementation)
  * 
- * Copyright (C) 2002  Red Hat, Inc.
+ * Copyright (C) 2002, 2003 Red Hat, Inc.
  *
  * Licensed under the Academic Free License version 1.2
  * 
@@ -38,40 +38,59 @@ struct DBusList
   DBusList *next; /**< Next list node. */
   void     *data; /**< Data stored at this element. */
 };
+dbus_bool_t _dbus_list_append             (DBusList **list,
+                                           void      *data);
+dbus_bool_t _dbus_list_prepend            (DBusList **list,
+                                           void      *data);
+dbus_bool_t _dbus_list_insert_before      (DBusList **list,
+                                           DBusList  *before_this_link,
+                                           void      *data);
+dbus_bool_t _dbus_list_insert_after       (DBusList **list,
+                                           DBusList  *after_this_link,
+                                           void      *data);
+void        _dbus_list_insert_before_link (DBusList **list,
+                                           DBusList  *before_this_link,
+                                           DBusList  *link);
+void        _dbus_list_insert_after_link  (DBusList **list,
+                                           DBusList  *after_this_link,
+                                           DBusList  *link);
+dbus_bool_t _dbus_list_remove             (DBusList **list,
+                                           void      *data);
+dbus_bool_t _dbus_list_remove_last        (DBusList **list,
+                                           void      *data);
+void        _dbus_list_remove_link        (DBusList **list,
+                                           DBusList  *link);
+void        _dbus_list_clear              (DBusList **list);
+DBusList*   _dbus_list_get_first_link     (DBusList **list);
+DBusList*   _dbus_list_get_last_link      (DBusList **list);
+void*       _dbus_list_get_last           (DBusList **list);
+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);
+DBusList*   _dbus_list_alloc_link         (void      *data);
+void        _dbus_list_free_link          (DBusList  *link);
+void        _dbus_list_unlink             (DBusList **list,
+                                           DBusList  *link);
+void        _dbus_list_append_link        (DBusList **list,
+                                           DBusList  *link);
+void        _dbus_list_prepend_link       (DBusList **list,
+                                           DBusList  *link);
+dbus_bool_t _dbus_list_length_is_one      (DBusList **list);
+
+
 
-dbus_bool_t _dbus_list_append         (DBusList **list,
-                                       void      *data);
-dbus_bool_t _dbus_list_prepend        (DBusList **list,
-                                       void      *data);
-dbus_bool_t _dbus_list_insert_before  (DBusList **list,
-                                       DBusList  *before_this_link,
-                                       void      *data);
-dbus_bool_t _dbus_list_insert_after   (DBusList **list,
-                                       DBusList  *after_this_link,
-                                       void      *data);
-dbus_bool_t _dbus_list_remove         (DBusList **list,
-                                       void      *data);
-dbus_bool_t _dbus_list_remove_last    (DBusList **list,
-                                       void      *data);
-void        _dbus_list_remove_link    (DBusList **list,
-                                       DBusList  *link);
-void        _dbus_list_clear          (DBusList **list);
-DBusList*   _dbus_list_get_first_link (DBusList **list);
-DBusList*   _dbus_list_get_last_link  (DBusList **list);
-void*       _dbus_list_get_last       (DBusList **list);
-void*       _dbus_list_get_first      (DBusList **list);
-void*       _dbus_list_pop_first      (DBusList **list);
-void*       _dbus_list_pop_last       (DBusList **list);
-dbus_bool_t _dbus_list_copy           (DBusList **list,
-                                       DBusList **dest);
-int         _dbus_list_get_length     (DBusList **list);
 
 void _dbus_list_foreach (DBusList            **list,
                          DBusForeachFunction   function,
                          void                 *data);
 
 #define _dbus_list_get_next_link(list, link) ((link)->next == *(list) ? NULL : (link)->next)
-#define _dbus_list_get_prev_link(list, link) ((link)->prev == *(list) ? NULL : (link)->prev)
+#define _dbus_list_get_prev_link(list, link) ((link) == *(list) ? NULL : (link)->prev)
 
 DBUS_END_DECLS;