g_list_reverse
g_list_sort
GCompareFunc
+g_list_insert_sorted_with_data
g_list_sort_with_data
GCompareDataFunc
g_list_concat
g_slist_length
g_slist_copy
g_slist_reverse
+g_slist_insert_sorted_with_data
g_slist_sort
g_slist_sort_with_data
g_slist_concat
@Returns: the new start of the #GList.
+<!-- ##### FUNCTION g_list_insert_sorted_with_data ##### -->
+<para>
+Inserts a new element into the list, using the given comparison function
+to determine its position.
+</para>
+
+@list: a pointer to a #GList.
+@data: the data for the new element.
+@func: the function to compare elements in the list. It should return a
+number > 0 if the first parameter comes after the second parameter in
+the sort order.
+@user_data: user data to pass to comparison function.
+@Returns: the new start of the #GList.
+@Since 2.10
+
+
<!-- ##### FUNCTION g_list_remove ##### -->
<para>
Removes an element from a #GList.
the sort order.
@Returns: the new start of the #GSList.
+<!-- ##### FUNCTION g_slist_insert_sorted_with_data ##### -->
+<para>
+Inserts a new element into the list, using the given comparison function
+to determine its position.
+</para>
+
+@list: a #GSList.
+@data: the data for the new element.
+@func: the function to compare elements in the list. It should return a
+number > 0 if the first parameter comes after the second parameter in
+the sort order.
+@user_data: data to pass to comparison function.
+@Returns: the new start of the #GSList.
+@Since 2.10
+
<!-- ##### FUNCTION g_slist_remove ##### -->
<para>
}
}
-
-GList*
-g_list_insert_sorted (GList *list,
- gpointer data,
- GCompareFunc func)
+static GList*
+g_list_insert_sorted_real (GList *list,
+ gpointer data,
+ GFunc func,
+ gpointer user_data)
{
GList *tmp_list = list;
GList *new_list;
return new_list;
}
- cmp = (*func) (data, tmp_list->data);
-
+ cmp = ((GCompareDataFunc) func) (data, tmp_list->data, user_data);
+
while ((tmp_list->next) && (cmp > 0))
{
tmp_list = tmp_list->next;
- cmp = (*func) (data, tmp_list->data);
+
+ cmp = ((GCompareDataFunc) func) (data, tmp_list->data, user_data);
}
new_list = _g_list_alloc0 ();
return list;
}
+GList*
+g_list_insert_sorted (GList *list,
+ gpointer data,
+ GCompareFunc func)
+{
+ return g_list_insert_sorted_real (list, data, (GFunc) func, NULL);
+}
+
+GList*
+g_list_insert_sorted_with_data (GList *list,
+ gpointer data,
+ GCompareDataFunc func,
+ gpointer user_data)
+{
+ return g_list_insert_sorted_real (list, data, (GFunc) func, user_data);
+}
+
static GList *
g_list_sort_merge (GList *l1,
GList *l2,
GFunc compare_func,
- gboolean use_data,
gpointer user_data)
{
GList list, *l, *lprev;
while (l1 && l2)
{
- if (use_data)
- cmp = ((GCompareDataFunc) compare_func) (l1->data, l2->data, user_data);
- else
- cmp = ((GCompareFunc) compare_func) (l1->data, l2->data);
+ cmp = ((GCompareDataFunc) compare_func) (l1->data, l2->data, user_data);
if (cmp <= 0)
{
static GList*
g_list_sort_real (GList *list,
GFunc compare_func,
- gboolean use_data,
gpointer user_data)
{
GList *l1, *l2;
l2 = l1->next;
l1->next = NULL;
- return g_list_sort_merge (g_list_sort_real (list, compare_func, use_data, user_data),
- g_list_sort_real (l2, compare_func, use_data, user_data),
+ return g_list_sort_merge (g_list_sort_real (list, compare_func, user_data),
+ g_list_sort_real (l2, compare_func, user_data),
compare_func,
- use_data,
user_data);
}
g_list_sort (GList *list,
GCompareFunc compare_func)
{
- return g_list_sort_real (list, (GFunc) compare_func, FALSE, NULL);
+ return g_list_sort_real (list, (GFunc) compare_func, NULL);
}
GCompareDataFunc compare_func,
gpointer user_data)
{
- return g_list_sort_real (list, (GFunc) compare_func, TRUE, user_data);
+ return g_list_sort_real (list, (GFunc) compare_func, user_data);
}
#define __G_LIST_C__
G_BEGIN_DECLS
-typedef struct _GList GList;
+typedef struct _GList GList;
struct _GList
{
/* Doubly linked lists
*/
-GList* g_list_alloc (void);
-void g_list_free (GList *list);
-void g_list_free_1 (GList *list);
-#define g_list_free1 g_list_free_1
-GList* g_list_append (GList *list,
- gpointer data);
-GList* g_list_prepend (GList *list,
- gpointer data);
-GList* g_list_insert (GList *list,
- gpointer data,
- gint position);
-GList* g_list_insert_sorted (GList *list,
- gpointer data,
- GCompareFunc func);
-GList* g_list_insert_before (GList *list,
- GList *sibling,
- gpointer data);
-GList* g_list_concat (GList *list1,
- GList *list2);
-GList* g_list_remove (GList *list,
- gconstpointer data);
-GList* g_list_remove_all (GList *list,
- gconstpointer data);
-GList* g_list_remove_link (GList *list,
- GList *llink);
-GList* g_list_delete_link (GList *list,
- GList *link_);
-GList* g_list_reverse (GList *list);
-GList* g_list_copy (GList *list);
-GList* g_list_nth (GList *list,
- guint n);
-GList* g_list_nth_prev (GList *list,
- guint n);
-GList* g_list_find (GList *list,
- gconstpointer data);
-GList* g_list_find_custom (GList *list,
- gconstpointer data,
- GCompareFunc func);
-gint g_list_position (GList *list,
- GList *llink);
-gint g_list_index (GList *list,
- gconstpointer data);
-GList* g_list_last (GList *list);
-GList* g_list_first (GList *list);
-guint g_list_length (GList *list);
-void g_list_foreach (GList *list,
- GFunc func,
- gpointer user_data);
-GList* g_list_sort (GList *list,
- GCompareFunc compare_func);
-GList* g_list_sort_with_data (GList *list,
- GCompareDataFunc compare_func,
- gpointer user_data);
-gpointer g_list_nth_data (GList *list,
- guint n);
+GList* g_list_alloc (void);
+void g_list_free (GList *list);
+void g_list_free_1 (GList *list);
+#define g_list_free1 g_list_free_1
+GList* g_list_append (GList *list,
+ gpointer data);
+GList* g_list_prepend (GList *list,
+ gpointer data);
+GList* g_list_insert (GList *list,
+ gpointer data,
+ gint position);
+GList* g_list_insert_sorted (GList *list,
+ gpointer data,
+ GCompareFunc func);
+GList* g_list_insert_sorted_with_data (GList *list,
+ gpointer data,
+ GCompareDataFunc func,
+ gpointer user_data);
+GList* g_list_insert_before (GList *list,
+ GList *sibling,
+ gpointer data);
+GList* g_list_concat (GList *list1,
+ GList *list2);
+GList* g_list_remove (GList *list,
+ gconstpointer data);
+GList* g_list_remove_all (GList *list,
+ gconstpointer data);
+GList* g_list_remove_link (GList *list,
+ GList *llink);
+GList* g_list_delete_link (GList *list,
+ GList *link_);
+GList* g_list_reverse (GList *list);
+GList* g_list_copy (GList *list);
+GList* g_list_nth (GList *list,
+ guint n);
+GList* g_list_nth_prev (GList *list,
+ guint n);
+GList* g_list_find (GList *list,
+ gconstpointer data);
+GList* g_list_find_custom (GList *list,
+ gconstpointer data,
+ GCompareFunc func);
+gint g_list_position (GList *list,
+ GList *llink);
+gint g_list_index (GList *list,
+ gconstpointer data);
+GList* g_list_last (GList *list);
+GList* g_list_first (GList *list);
+guint g_list_length (GList *list);
+void g_list_foreach (GList *list,
+ GFunc func,
+ gpointer user_data);
+GList* g_list_sort (GList *list,
+ GCompareFunc compare_func);
+GList* g_list_sort_with_data (GList *list,
+ GCompareDataFunc compare_func,
+ gpointer user_data);
+gpointer g_list_nth_data (GList *list,
+ guint n);
-#define g_list_previous(list) ((list) ? (((GList *)(list))->prev) : NULL)
-#define g_list_next(list) ((list) ? (((GList *)(list))->next) : NULL)
+
+#define g_list_previous(list) ((list) ? (((GList *)(list))->prev) : NULL)
+#define g_list_next(list) ((list) ? (((GList *)(list))->next) : NULL)
#ifndef G_DISABLE_DEPRECATED
-void g_list_push_allocator (gpointer allocator);
-void g_list_pop_allocator (void);
+void g_list_push_allocator (gpointer allocator);
+void g_list_pop_allocator (void);
#endif
G_END_DECLS
}
}
-GSList*
-g_slist_insert_sorted (GSList *list,
- gpointer data,
- GCompareFunc func)
+static GSList*
+g_slist_insert_sorted_real (GSList *list,
+ gpointer data,
+ GFunc func,
+ gpointer user_data)
{
GSList *tmp_list = list;
GSList *prev_list = NULL;
return new_list;
}
- cmp = (*func) (data, tmp_list->data);
+ cmp = ((GCompareDataFunc) func) (data, tmp_list->data, user_data);
while ((tmp_list->next) && (cmp > 0))
{
prev_list = tmp_list;
tmp_list = tmp_list->next;
- cmp = (*func) (data, tmp_list->data);
+
+ cmp = ((GCompareDataFunc) func) (data, tmp_list->data, user_data);
}
new_list = _g_slist_alloc0 ();
}
}
+GSList*
+g_slist_insert_sorted (GSList *list,
+ gpointer data,
+ GCompareFunc func)
+{
+ return g_slist_insert_sorted_real (list, data, (GFunc) func, NULL);
+}
+
+GSList*
+g_slist_insert_sorted_with_data (GSList *list,
+ gpointer data,
+ GCompareDataFunc func,
+ gpointer user_data)
+{
+ return g_slist_insert_sorted_real (list, data, (GFunc) func, user_data);
+}
+
static GSList *
g_slist_sort_merge (GSList *l1,
GSList *l2,
GFunc compare_func,
- gboolean use_data,
gpointer user_data)
{
GSList list, *l;
while (l1 && l2)
{
- if (use_data)
- cmp = ((GCompareDataFunc) compare_func) (l1->data, l2->data, user_data);
- else
- cmp = ((GCompareFunc) compare_func) (l1->data, l2->data);
+ cmp = ((GCompareDataFunc) compare_func) (l1->data, l2->data, user_data);
if (cmp <= 0)
{
static GSList *
g_slist_sort_real (GSList *list,
GFunc compare_func,
- gboolean use_data,
gpointer user_data)
{
GSList *l1, *l2;
l2 = l1->next;
l1->next = NULL;
- return g_slist_sort_merge (g_slist_sort_real (list, compare_func, use_data, user_data),
- g_slist_sort_real (l2, compare_func, use_data, user_data),
+ return g_slist_sort_merge (g_slist_sort_real (list, compare_func, user_data),
+ g_slist_sort_real (l2, compare_func, user_data),
compare_func,
- use_data,
user_data);
}
g_slist_sort (GSList *list,
GCompareFunc compare_func)
{
- return g_slist_sort_real (list, (GFunc) compare_func, FALSE, NULL);
+ return g_slist_sort_real (list, (GFunc) compare_func, NULL);
}
GSList *
GCompareDataFunc compare_func,
gpointer user_data)
{
- return g_slist_sort_real (list, (GFunc) compare_func, TRUE, user_data);
+ return g_slist_sort_real (list, (GFunc) compare_func, user_data);
}
#define __G_SLIST_C__
G_BEGIN_DECLS
-typedef struct _GSList GSList;
+typedef struct _GSList GSList;
struct _GSList
{
/* Singly linked lists
*/
-GSList* g_slist_alloc (void);
-void g_slist_free (GSList *list);
-void g_slist_free_1 (GSList *list);
-#define g_slist_free1 g_slist_free_1
-GSList* g_slist_append (GSList *list,
- gpointer data);
-GSList* g_slist_prepend (GSList *list,
- gpointer data);
-GSList* g_slist_insert (GSList *list,
- gpointer data,
- gint position);
-GSList* g_slist_insert_sorted (GSList *list,
- gpointer data,
- GCompareFunc func);
-GSList* g_slist_insert_before (GSList *slist,
- GSList *sibling,
- gpointer data);
-GSList* g_slist_concat (GSList *list1,
- GSList *list2);
-GSList* g_slist_remove (GSList *list,
- gconstpointer data);
-GSList* g_slist_remove_all (GSList *list,
- gconstpointer data);
-GSList* g_slist_remove_link (GSList *list,
- GSList *link_);
-GSList* g_slist_delete_link (GSList *list,
- GSList *link_);
-GSList* g_slist_reverse (GSList *list);
-GSList* g_slist_copy (GSList *list);
-GSList* g_slist_nth (GSList *list,
- guint n);
-GSList* g_slist_find (GSList *list,
- gconstpointer data);
-GSList* g_slist_find_custom (GSList *list,
- gconstpointer data,
- GCompareFunc func);
-gint g_slist_position (GSList *list,
- GSList *llink);
-gint g_slist_index (GSList *list,
- gconstpointer data);
-GSList* g_slist_last (GSList *list);
-guint g_slist_length (GSList *list);
-void g_slist_foreach (GSList *list,
- GFunc func,
- gpointer user_data);
-GSList* g_slist_sort (GSList *list,
- GCompareFunc compare_func);
-GSList* g_slist_sort_with_data (GSList *list,
- GCompareDataFunc compare_func,
- gpointer user_data);
-gpointer g_slist_nth_data (GSList *list,
- guint n);
-#define g_slist_next(slist) ((slist) ? (((GSList *)(slist))->next) : NULL)
+GSList* g_slist_alloc (void);
+void g_slist_free (GSList *list);
+void g_slist_free_1 (GSList *list);
+#define g_slist_free1 g_slist_free_1
+GSList* g_slist_append (GSList *list,
+ gpointer data);
+GSList* g_slist_prepend (GSList *list,
+ gpointer data);
+GSList* g_slist_insert (GSList *list,
+ gpointer data,
+ gint position);
+GSList* g_slist_insert_sorted (GSList *list,
+ gpointer data,
+ GCompareFunc func);
+GSList* g_slist_insert_sorted_with_data (GSList *list,
+ gpointer data,
+ GCompareDataFunc func,
+ gpointer user_data);
+GSList* g_slist_insert_before (GSList *slist,
+ GSList *sibling,
+ gpointer data);
+GSList* g_slist_concat (GSList *list1,
+ GSList *list2);
+GSList* g_slist_remove (GSList *list,
+ gconstpointer data);
+GSList* g_slist_remove_all (GSList *list,
+ gconstpointer data);
+GSList* g_slist_remove_link (GSList *list,
+ GSList *link_);
+GSList* g_slist_delete_link (GSList *list,
+ GSList *link_);
+GSList* g_slist_reverse (GSList *list);
+GSList* g_slist_copy (GSList *list);
+GSList* g_slist_nth (GSList *list,
+ guint n);
+GSList* g_slist_find (GSList *list,
+ gconstpointer data);
+GSList* g_slist_find_custom (GSList *list,
+ gconstpointer data,
+ GCompareFunc func);
+gint g_slist_position (GSList *list,
+ GSList *llink);
+gint g_slist_index (GSList *list,
+ gconstpointer data);
+GSList* g_slist_last (GSList *list);
+guint g_slist_length (GSList *list);
+void g_slist_foreach (GSList *list,
+ GFunc func,
+ gpointer user_data);
+GSList* g_slist_sort (GSList *list,
+ GCompareFunc compare_func);
+GSList* g_slist_sort_with_data (GSList *list,
+ GCompareDataFunc compare_func,
+ gpointer user_data);
+gpointer g_slist_nth_data (GSList *list,
+ guint n);
+
+#define g_slist_next(slist) ((slist) ? (((GSList *)(slist))->next) : NULL)
#ifndef G_DISABLE_DEPRECATED
-void g_slist_push_allocator (gpointer dummy);
-void g_slist_pop_allocator (void);
+void g_slist_push_allocator (gpointer dummy);
+void g_slist_pop_allocator (void);
#endif
G_END_DECLS
projects / dana / cg-glib.git / commitdiff