1998-06-10 23:21:14 +00:00
|
|
|
/* GLIB - Library of useful routines for C programming
|
|
|
|
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
2000-07-26 11:02:02 +00:00
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
1998-06-10 23:21:14 +00:00
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2000-07-26 11:02:02 +00:00
|
|
|
* Lesser General Public License for more details.
|
1998-06-10 23:21:14 +00:00
|
|
|
*
|
2000-07-26 11:02:02 +00:00
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
1998-06-10 23:21:14 +00:00
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
1998-12-15 05:28:02 +00:00
|
|
|
|
1999-02-24 06:14:27 +00:00
|
|
|
/*
|
2000-07-26 11:02:02 +00:00
|
|
|
* Modified by the GLib Team and others 1997-2000. See the AUTHORS
|
1999-02-24 06:14:27 +00:00
|
|
|
* file for a list of people on the GLib Team. See the ChangeLog
|
|
|
|
* files for a list of changes. These files are distributed with
|
|
|
|
* GLib at ftp://ftp.gtk.org/pub/gtk/.
|
|
|
|
*/
|
|
|
|
|
1998-12-15 05:28:02 +00:00
|
|
|
/*
|
|
|
|
* MT safe
|
|
|
|
*/
|
|
|
|
|
2002-12-04 01:27:44 +00:00
|
|
|
#include "config.h"
|
2000-12-19 09:35:44 +00:00
|
|
|
|
1998-06-10 23:21:14 +00:00
|
|
|
#include "glib.h"
|
2005-03-14 04:26:57 +00:00
|
|
|
#include "galias.h"
|
1998-06-10 23:21:14 +00:00
|
|
|
|
|
|
|
|
2005-11-01 18:10:31 +00:00
|
|
|
void g_list_push_allocator (gpointer dummy) { /* present for binary compat only */ }
|
|
|
|
void g_list_pop_allocator (void) { /* present for binary compat only */ }
|
1998-11-24 12:18:22 +00:00
|
|
|
|
2005-11-01 18:10:31 +00:00
|
|
|
#define _g_list_alloc0() g_slice_new0 (GList)
|
|
|
|
#define _g_list_free1(list) g_slice_free (GList, list)
|
1998-06-10 23:21:14 +00:00
|
|
|
|
1999-08-17 17:41:01 +00:00
|
|
|
GList*
|
|
|
|
g_list_alloc (void)
|
|
|
|
{
|
2005-11-01 18:10:31 +00:00
|
|
|
return _g_list_alloc0 ();
|
1999-08-17 17:41:01 +00:00
|
|
|
}
|
|
|
|
|
1998-06-10 23:21:14 +00:00
|
|
|
void
|
|
|
|
g_list_free (GList *list)
|
|
|
|
{
|
2005-12-05 15:01:27 +00:00
|
|
|
g_slice_free_chain (GList, list, next);
|
1998-06-10 23:21:14 +00:00
|
|
|
}
|
|
|
|
|
1999-08-17 17:41:01 +00:00
|
|
|
void
|
|
|
|
g_list_free_1 (GList *list)
|
|
|
|
{
|
2005-11-01 18:10:31 +00:00
|
|
|
_g_list_free1 (list);
|
1999-08-17 17:41:01 +00:00
|
|
|
}
|
|
|
|
|
1998-06-10 23:21:14 +00:00
|
|
|
GList*
|
|
|
|
g_list_append (GList *list,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
GList *new_list;
|
|
|
|
GList *last;
|
|
|
|
|
2005-11-01 18:10:31 +00:00
|
|
|
new_list = _g_list_alloc0 ();
|
1998-06-10 23:21:14 +00:00
|
|
|
new_list->data = data;
|
|
|
|
|
|
|
|
if (list)
|
|
|
|
{
|
|
|
|
last = g_list_last (list);
|
|
|
|
/* g_assert (last != NULL); */
|
|
|
|
last->next = new_list;
|
|
|
|
new_list->prev = last;
|
|
|
|
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return new_list;
|
|
|
|
}
|
|
|
|
|
|
|
|
GList*
|
|
|
|
g_list_prepend (GList *list,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
GList *new_list;
|
|
|
|
|
2005-11-01 18:10:31 +00:00
|
|
|
new_list = _g_list_alloc0 ();
|
1998-06-10 23:21:14 +00:00
|
|
|
new_list->data = data;
|
|
|
|
|
|
|
|
if (list)
|
|
|
|
{
|
|
|
|
if (list->prev)
|
|
|
|
{
|
|
|
|
list->prev->next = new_list;
|
|
|
|
new_list->prev = list->prev;
|
|
|
|
}
|
|
|
|
list->prev = new_list;
|
|
|
|
new_list->next = list;
|
|
|
|
}
|
|
|
|
|
|
|
|
return new_list;
|
|
|
|
}
|
|
|
|
|
|
|
|
GList*
|
|
|
|
g_list_insert (GList *list,
|
|
|
|
gpointer data,
|
|
|
|
gint position)
|
|
|
|
{
|
|
|
|
GList *new_list;
|
|
|
|
GList *tmp_list;
|
|
|
|
|
|
|
|
if (position < 0)
|
|
|
|
return g_list_append (list, data);
|
|
|
|
else if (position == 0)
|
|
|
|
return g_list_prepend (list, data);
|
|
|
|
|
|
|
|
tmp_list = g_list_nth (list, position);
|
|
|
|
if (!tmp_list)
|
|
|
|
return g_list_append (list, data);
|
|
|
|
|
2005-11-01 18:10:31 +00:00
|
|
|
new_list = _g_list_alloc0 ();
|
1998-06-10 23:21:14 +00:00
|
|
|
new_list->data = data;
|
|
|
|
|
|
|
|
if (tmp_list->prev)
|
|
|
|
{
|
|
|
|
tmp_list->prev->next = new_list;
|
|
|
|
new_list->prev = tmp_list->prev;
|
|
|
|
}
|
|
|
|
new_list->next = tmp_list;
|
|
|
|
tmp_list->prev = new_list;
|
|
|
|
|
|
|
|
if (tmp_list == list)
|
|
|
|
return new_list;
|
|
|
|
else
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
2001-07-02 05:02:13 +00:00
|
|
|
GList*
|
|
|
|
g_list_insert_before (GList *list,
|
|
|
|
GList *sibling,
|
|
|
|
gpointer data)
|
|
|
|
{
|
|
|
|
if (!list)
|
|
|
|
{
|
|
|
|
list = g_list_alloc ();
|
|
|
|
list->data = data;
|
|
|
|
g_return_val_if_fail (sibling == NULL, list);
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
else if (sibling)
|
|
|
|
{
|
|
|
|
GList *node;
|
|
|
|
|
|
|
|
node = g_list_alloc ();
|
|
|
|
node->data = data;
|
|
|
|
if (sibling->prev)
|
|
|
|
{
|
|
|
|
node->prev = sibling->prev;
|
|
|
|
node->prev->next = node;
|
|
|
|
node->next = sibling;
|
|
|
|
sibling->prev = node;
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
node->next = sibling;
|
|
|
|
sibling->prev = node;
|
|
|
|
g_return_val_if_fail (sibling == list, node);
|
|
|
|
return node;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
GList *last;
|
|
|
|
|
|
|
|
last = list;
|
|
|
|
while (last->next)
|
|
|
|
last = last->next;
|
|
|
|
|
|
|
|
last->next = g_list_alloc ();
|
|
|
|
last->next->data = data;
|
|
|
|
last->next->prev = last;
|
|
|
|
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-06-10 23:21:14 +00:00
|
|
|
GList *
|
|
|
|
g_list_concat (GList *list1, GList *list2)
|
|
|
|
{
|
|
|
|
GList *tmp_list;
|
|
|
|
|
|
|
|
if (list2)
|
|
|
|
{
|
|
|
|
tmp_list = g_list_last (list1);
|
|
|
|
if (tmp_list)
|
|
|
|
tmp_list->next = list2;
|
|
|
|
else
|
|
|
|
list1 = list2;
|
|
|
|
list2->prev = tmp_list;
|
|
|
|
}
|
|
|
|
|
|
|
|
return list1;
|
|
|
|
}
|
|
|
|
|
|
|
|
GList*
|
2000-04-18 14:01:33 +00:00
|
|
|
g_list_remove (GList *list,
|
|
|
|
gconstpointer data)
|
1998-06-10 23:21:14 +00:00
|
|
|
{
|
|
|
|
GList *tmp;
|
|
|
|
|
|
|
|
tmp = list;
|
|
|
|
while (tmp)
|
|
|
|
{
|
|
|
|
if (tmp->data != data)
|
|
|
|
tmp = tmp->next;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (tmp->prev)
|
|
|
|
tmp->prev->next = tmp->next;
|
|
|
|
if (tmp->next)
|
|
|
|
tmp->next->prev = tmp->prev;
|
|
|
|
|
|
|
|
if (list == tmp)
|
|
|
|
list = list->next;
|
|
|
|
|
2005-11-01 18:10:31 +00:00
|
|
|
_g_list_free1 (tmp);
|
1998-06-10 23:21:14 +00:00
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
2001-03-18 04:44:38 +00:00
|
|
|
GList*
|
|
|
|
g_list_remove_all (GList *list,
|
|
|
|
gconstpointer data)
|
|
|
|
{
|
|
|
|
GList *tmp = list;
|
|
|
|
|
|
|
|
while (tmp)
|
|
|
|
{
|
|
|
|
if (tmp->data != data)
|
|
|
|
tmp = tmp->next;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
GList *next = tmp->next;
|
|
|
|
|
|
|
|
if (tmp->prev)
|
|
|
|
tmp->prev->next = next;
|
|
|
|
else
|
|
|
|
list = next;
|
|
|
|
if (next)
|
|
|
|
next->prev = tmp->prev;
|
|
|
|
|
2005-11-01 18:10:31 +00:00
|
|
|
_g_list_free1 (tmp);
|
2001-03-18 04:44:38 +00:00
|
|
|
tmp = next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
1999-08-17 17:41:01 +00:00
|
|
|
static inline GList*
|
|
|
|
_g_list_remove_link (GList *list,
|
|
|
|
GList *link)
|
1998-06-10 23:21:14 +00:00
|
|
|
{
|
|
|
|
if (link)
|
|
|
|
{
|
|
|
|
if (link->prev)
|
|
|
|
link->prev->next = link->next;
|
|
|
|
if (link->next)
|
|
|
|
link->next->prev = link->prev;
|
|
|
|
|
|
|
|
if (link == list)
|
|
|
|
list = list->next;
|
|
|
|
|
|
|
|
link->next = NULL;
|
|
|
|
link->prev = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
1999-08-17 17:41:01 +00:00
|
|
|
GList*
|
|
|
|
g_list_remove_link (GList *list,
|
|
|
|
GList *link)
|
|
|
|
{
|
|
|
|
return _g_list_remove_link (list, link);
|
|
|
|
}
|
|
|
|
|
1999-03-09 19:41:19 +00:00
|
|
|
GList*
|
1999-07-24 18:50:58 +00:00
|
|
|
g_list_delete_link (GList *list,
|
|
|
|
GList *link)
|
1999-03-09 19:41:19 +00:00
|
|
|
{
|
1999-08-17 17:41:01 +00:00
|
|
|
list = _g_list_remove_link (list, link);
|
2005-11-01 18:10:31 +00:00
|
|
|
_g_list_free1 (link);
|
1999-03-09 19:41:19 +00:00
|
|
|
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
1998-11-23 01:52:07 +00:00
|
|
|
GList*
|
|
|
|
g_list_copy (GList *list)
|
|
|
|
{
|
|
|
|
GList *new_list = NULL;
|
|
|
|
|
|
|
|
if (list)
|
|
|
|
{
|
|
|
|
GList *last;
|
|
|
|
|
2005-11-01 18:10:31 +00:00
|
|
|
new_list = _g_list_alloc0 ();
|
1998-11-23 01:52:07 +00:00
|
|
|
new_list->data = list->data;
|
|
|
|
last = new_list;
|
|
|
|
list = list->next;
|
|
|
|
while (list)
|
|
|
|
{
|
2005-11-01 18:10:31 +00:00
|
|
|
last->next = _g_list_alloc0 ();
|
1998-11-23 01:52:07 +00:00
|
|
|
last->next->prev = last;
|
|
|
|
last = last->next;
|
|
|
|
last->data = list->data;
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return new_list;
|
|
|
|
}
|
|
|
|
|
1998-06-10 23:21:14 +00:00
|
|
|
GList*
|
|
|
|
g_list_reverse (GList *list)
|
|
|
|
{
|
|
|
|
GList *last;
|
|
|
|
|
|
|
|
last = NULL;
|
|
|
|
while (list)
|
|
|
|
{
|
|
|
|
last = list;
|
|
|
|
list = last->next;
|
|
|
|
last->next = last->prev;
|
|
|
|
last->prev = list;
|
|
|
|
}
|
|
|
|
|
|
|
|
return last;
|
|
|
|
}
|
|
|
|
|
|
|
|
GList*
|
|
|
|
g_list_nth (GList *list,
|
|
|
|
guint n)
|
|
|
|
{
|
|
|
|
while ((n-- > 0) && list)
|
|
|
|
list = list->next;
|
|
|
|
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
2001-04-03 13:15:41 +00:00
|
|
|
GList*
|
|
|
|
g_list_nth_prev (GList *list,
|
|
|
|
guint n)
|
|
|
|
{
|
|
|
|
while ((n-- > 0) && list)
|
|
|
|
list = list->prev;
|
|
|
|
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
1998-06-10 23:21:14 +00:00
|
|
|
gpointer
|
|
|
|
g_list_nth_data (GList *list,
|
|
|
|
guint n)
|
|
|
|
{
|
|
|
|
while ((n-- > 0) && list)
|
|
|
|
list = list->next;
|
|
|
|
|
|
|
|
return list ? list->data : NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
GList*
|
2000-04-18 14:01:33 +00:00
|
|
|
g_list_find (GList *list,
|
|
|
|
gconstpointer data)
|
1998-06-10 23:21:14 +00:00
|
|
|
{
|
|
|
|
while (list)
|
|
|
|
{
|
|
|
|
if (list->data == data)
|
|
|
|
break;
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
|
|
|
GList*
|
2000-04-18 14:01:33 +00:00
|
|
|
g_list_find_custom (GList *list,
|
|
|
|
gconstpointer data,
|
|
|
|
GCompareFunc func)
|
1998-06-10 23:21:14 +00:00
|
|
|
{
|
|
|
|
g_return_val_if_fail (func != NULL, list);
|
|
|
|
|
|
|
|
while (list)
|
|
|
|
{
|
|
|
|
if (! func (list->data, data))
|
|
|
|
return list;
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
gint
|
|
|
|
g_list_position (GList *list,
|
|
|
|
GList *link)
|
|
|
|
{
|
|
|
|
gint i;
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
while (list)
|
|
|
|
{
|
|
|
|
if (list == link)
|
|
|
|
return i;
|
|
|
|
i++;
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
gint
|
2000-04-18 14:01:33 +00:00
|
|
|
g_list_index (GList *list,
|
|
|
|
gconstpointer data)
|
1998-06-10 23:21:14 +00:00
|
|
|
{
|
|
|
|
gint i;
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
while (list)
|
|
|
|
{
|
|
|
|
if (list->data == data)
|
|
|
|
return i;
|
|
|
|
i++;
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
GList*
|
|
|
|
g_list_last (GList *list)
|
|
|
|
{
|
|
|
|
if (list)
|
|
|
|
{
|
|
|
|
while (list->next)
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
|
|
|
GList*
|
|
|
|
g_list_first (GList *list)
|
|
|
|
{
|
|
|
|
if (list)
|
|
|
|
{
|
|
|
|
while (list->prev)
|
|
|
|
list = list->prev;
|
|
|
|
}
|
|
|
|
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
|
|
|
guint
|
|
|
|
g_list_length (GList *list)
|
|
|
|
{
|
|
|
|
guint length;
|
|
|
|
|
|
|
|
length = 0;
|
|
|
|
while (list)
|
|
|
|
{
|
|
|
|
length++;
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
return length;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
g_list_foreach (GList *list,
|
|
|
|
GFunc func,
|
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
while (list)
|
|
|
|
{
|
2001-05-03 10:47:32 +00:00
|
|
|
GList *next = list->next;
|
1998-06-10 23:21:14 +00:00
|
|
|
(*func) (list->data, user_data);
|
2001-05-03 10:47:32 +00:00
|
|
|
list = next;
|
1998-06-10 23:21:14 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-12-07 11:35:27 +00:00
|
|
|
static GList*
|
|
|
|
g_list_insert_sorted_real (GList *list,
|
|
|
|
gpointer data,
|
|
|
|
GFunc func,
|
|
|
|
gpointer user_data)
|
1998-06-10 23:21:14 +00:00
|
|
|
{
|
|
|
|
GList *tmp_list = list;
|
|
|
|
GList *new_list;
|
|
|
|
gint cmp;
|
|
|
|
|
|
|
|
g_return_val_if_fail (func != NULL, list);
|
|
|
|
|
|
|
|
if (!list)
|
|
|
|
{
|
2005-11-01 18:10:31 +00:00
|
|
|
new_list = _g_list_alloc0 ();
|
1998-06-10 23:21:14 +00:00
|
|
|
new_list->data = data;
|
|
|
|
return new_list;
|
|
|
|
}
|
|
|
|
|
2005-12-07 11:35:27 +00:00
|
|
|
cmp = ((GCompareDataFunc) func) (data, tmp_list->data, user_data);
|
|
|
|
|
1998-06-10 23:21:14 +00:00
|
|
|
while ((tmp_list->next) && (cmp > 0))
|
|
|
|
{
|
|
|
|
tmp_list = tmp_list->next;
|
2005-12-07 11:35:27 +00:00
|
|
|
|
|
|
|
cmp = ((GCompareDataFunc) func) (data, tmp_list->data, user_data);
|
1998-06-10 23:21:14 +00:00
|
|
|
}
|
|
|
|
|
2005-11-01 18:10:31 +00:00
|
|
|
new_list = _g_list_alloc0 ();
|
1998-06-10 23:21:14 +00:00
|
|
|
new_list->data = data;
|
|
|
|
|
|
|
|
if ((!tmp_list->next) && (cmp > 0))
|
|
|
|
{
|
|
|
|
tmp_list->next = new_list;
|
|
|
|
new_list->prev = tmp_list;
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tmp_list->prev)
|
|
|
|
{
|
|
|
|
tmp_list->prev->next = new_list;
|
|
|
|
new_list->prev = tmp_list->prev;
|
|
|
|
}
|
|
|
|
new_list->next = tmp_list;
|
|
|
|
tmp_list->prev = new_list;
|
|
|
|
|
|
|
|
if (tmp_list == list)
|
|
|
|
return new_list;
|
|
|
|
else
|
|
|
|
return list;
|
|
|
|
}
|
1998-11-13 20:50:41 +00:00
|
|
|
|
2005-12-07 11:35:27 +00:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
1998-11-13 20:50:41 +00:00
|
|
|
static GList *
|
2000-11-20 23:59:32 +00:00
|
|
|
g_list_sort_merge (GList *l1,
|
|
|
|
GList *l2,
|
|
|
|
GFunc compare_func,
|
|
|
|
gpointer user_data)
|
1998-11-13 20:50:41 +00:00
|
|
|
{
|
|
|
|
GList list, *l, *lprev;
|
2000-11-20 23:59:32 +00:00
|
|
|
gint cmp;
|
1998-11-13 20:50:41 +00:00
|
|
|
|
|
|
|
l = &list;
|
|
|
|
lprev = NULL;
|
|
|
|
|
|
|
|
while (l1 && l2)
|
|
|
|
{
|
2005-12-07 11:35:27 +00:00
|
|
|
cmp = ((GCompareDataFunc) compare_func) (l1->data, l2->data, user_data);
|
2000-11-20 23:59:32 +00:00
|
|
|
|
|
|
|
if (cmp <= 0)
|
1998-11-13 20:50:41 +00:00
|
|
|
{
|
|
|
|
l->next = l1;
|
|
|
|
l1 = l1->next;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
l->next = l2;
|
|
|
|
l2 = l2->next;
|
|
|
|
}
|
2005-11-04 22:27:04 +00:00
|
|
|
l = l->next;
|
|
|
|
l->prev = lprev;
|
|
|
|
lprev = l;
|
1998-11-13 20:50:41 +00:00
|
|
|
}
|
|
|
|
l->next = l1 ? l1 : l2;
|
|
|
|
l->next->prev = l;
|
|
|
|
|
|
|
|
return list.next;
|
|
|
|
}
|
|
|
|
|
Changes for 64-bit cleanliness, loosely based on patch from Mark Murnane.
Wed Jun 20 12:00:54 2001 Owen Taylor <otaylor@redhat.com>
Changes for 64-bit cleanliness, loosely based on patch
from Mark Murnane.
* gconvert.c (g_convert/g_convert_with_fallback): Remove
workarounds for since-fixed GNU libc bugs. Minor
doc fix.
* gconvert.[ch]: Change gint to gsize/gssize as
appropriate.
* gconvert.c (g_locale/filename_to/from_utf8): Fix incorrect
computation of bytes_read / bytes_written.
* gfileutils.[ch] (g_file_get_contents): Make length
out parameter 'gsize *len'.
* ghook.c (g_hook_compare_ids): Don't compare a
and b as 'a - b'.
* gmacros.h (GSIZE_TO_POINTER): Add GPOINTER_TO_SIZE,
GSIZE_TO_POINTER.
* gmain.c (g_timeout_prepare): Rewrite to avoid
overflows. (Fixes bug when system clock skews
backwards more than 24 days.)
* gmarkup.[ch]: Make lengths passed to callbacks
gsize, length for g_markup_parse-context_parse(),
g_markup_escape_text() gssize.
* gmessages.[ch] (g_printf_string_upper_bound): Change
return value to gsize.
* gmessages.c (printf_string_upper_bound): Remove
a ridiculous use of 'inline' on a 300 line function.
* gstring.[ch]: Represent size of string as a gsize,
not gint. Make parameters to functions take gsize,
or gssize where -1 is allowed.
* gstring.c (g_string_erase): Make
g_string_erase (string, pos, -1) a synonym for
g_string_truncate for consistency with other G*
APIs.
* gstrfuncs.[ch]: Make all functions taking a string
length, take a gsize, or gssize if -1 is allowed.
(g_strstr_len, g_strrstr_len). Also fix some boundary
conditions in g_str[r]str[_len].
* gutf8.c tests/unicode-encoding.c: Make parameters that
are byte lengths gsize, gssize as appropriate. Make
character offsets, other counts, glong.
* gasyncqueue.c gcompletion.c
timeloop.c timeloop-basic.c gutils.c gspawn.c.
Small 64 bit cleanliness fixups.
* glist.c (g_list_sort2, g_list_sort_real): Fix functions
that should have been static.
* gdate.c (g_date_fill_parse_tokens): Fix extra
declaration that was shadowing another.
* tests/module-test.c: Include string.h
Mon Jun 18 15:43:29 2001 Owen Taylor <otaylor@redhat.com>
* gutf8.c (g_get_charset): Make argument
G_CONST_RETURN char **.
2001-06-23 13:55:09 +00:00
|
|
|
static GList*
|
2000-11-20 23:59:32 +00:00
|
|
|
g_list_sort_real (GList *list,
|
|
|
|
GFunc compare_func,
|
|
|
|
gpointer user_data)
|
1998-11-13 20:50:41 +00:00
|
|
|
{
|
|
|
|
GList *l1, *l2;
|
|
|
|
|
|
|
|
if (!list)
|
|
|
|
return NULL;
|
|
|
|
if (!list->next)
|
|
|
|
return list;
|
|
|
|
|
|
|
|
l1 = list;
|
|
|
|
l2 = list->next;
|
|
|
|
|
|
|
|
while ((l2 = l2->next) != NULL)
|
|
|
|
{
|
|
|
|
if ((l2 = l2->next) == NULL)
|
|
|
|
break;
|
|
|
|
l1 = l1->next;
|
|
|
|
}
|
|
|
|
l2 = l1->next;
|
|
|
|
l1->next = NULL;
|
|
|
|
|
2005-12-07 11:35:27 +00:00
|
|
|
return g_list_sort_merge (g_list_sort_real (list, compare_func, user_data),
|
|
|
|
g_list_sort_real (l2, compare_func, user_data),
|
2000-11-20 23:59:32 +00:00
|
|
|
compare_func,
|
|
|
|
user_data);
|
|
|
|
}
|
|
|
|
|
|
|
|
GList *
|
|
|
|
g_list_sort (GList *list,
|
|
|
|
GCompareFunc compare_func)
|
|
|
|
{
|
2005-12-07 11:35:27 +00:00
|
|
|
return g_list_sort_real (list, (GFunc) compare_func, NULL);
|
2000-11-20 23:59:32 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
GList *
|
|
|
|
g_list_sort_with_data (GList *list,
|
changed prototype of g_boxed_type_register_static() to contain an optional
Wed Mar 7 09:36:33 2001 Tim Janik <timj@gtk.org>
* gboxed.[hc]: changed prototype of g_boxed_type_register_static()
to contain an optional init function and a hint at whether the
boxed structure uses ref counting internally.
added g_value_set_boxed_take_ownership().
made G_TYPE_BOXED an abstract value type.
* genums.[hc]: made G_TYPE_ENUM and G_TYPE_FLAGS abstract value
types.
* glib-genmarshal.c: argument type changes, preparation for third-party
arg specification.
* gobject.[hc]: cleaned up get/set property code.
added g_strdup_value_contents() to improve warnings.
* gparam.[hc]: added g_param_value_convert(), taking over responsibility
of the old g_value_convert(). added G_PARAM_LAX_VALIDATION flag so
validation alterations may be valid a part of the property setting
process.
* gparamspecs.[hc]: made value comparisons stable (for sort applications).
added GParamSpecValueArray, a param spec for value arrays and
GParamSpecClosure. nuked the value exchange functions and
GParamSpecCCallback.
* gtype.[hc]: catch unintialized usages of the type system with
g_return_val_if_uninitialized(). introduced G_TYPE_FLAG_VALUE_ABSTRACT
to flag types that introduce a value table, but can't be used for
g_value_init(). cleaned up reserved type ids.
* gvalue.[hc]: code cleanups and saner checking.
nuked the value exchange API. implemented value transformations, we
can't really "convert" values, rather transforms are an anylogy to
C casts, real conversions need a param spec for validation, which is
why g_param_value_convert() does real conversions now.
* gvaluearray.[hc]: new files that implement a GValueArray, a struct
that can hold inhomogeneous arrays of value (to that extend that it
also allowes undefined values, i.e. G_VALUE_TYPE(value)==0).
this is exposed to the type system as a boxed type.
* gvaluetransform.c: new file implementing most of the former value
exchange functions as single-sided transformations.
* gvaluetypes.[hc]: nuked G_TYPE_CCALLBACK, added
g_value_set_string_take_ownership().
* *.h: s/G_IS_VALUE_/G_VALUE_HOLDS_/.
* *.[hc]: many fixes and cleanups.
* many warning improvements.
Tue Feb 27 18:35:15 2001 Tim Janik <timj@gtk.org>
* gobject.c (g_object_get_valist): urg, pass G_VALUE_NOCOPY_CONTENTS
into G_VALUE_LCOPY(), this needs proper documenting.
* gparam.c: fixed G_PARAM_USER_MASK.
* gtype.c (type_data_make_W):
(type_data_last_unref_Wm): fixed invalid memory freeing.
* gobject.c (g_object_last_unref): destroy signal handlers associated
with object, right before finalization.
* gsignal.c (g_signal_parse_name): catch destroyed nodes or signals
that don't actually support details.
* gobject.[hc]: got rid of property trailers. nuked GObject
properties "data" and the "signal" variants.
(g_object_connect): new convenience function to do multiple
signal connections at once.
(g_object_disconnect): likewise, for disconnections.
* gparam.[hc] (g_param_spec_pool_lookup): took out trailer support.
* gvalue.[hc]: marked g_value_fits_pointer() and g_value_peek_pointer()
as private (the latter got renamed from g_value_get_as_pointer()).
Wed Mar 7 09:32:06 2001 Tim Janik <timj@gtk.org>
* glib-object.h: add gvaluearray.h.
* gstring.[hc]: fixup naming of g_string_sprint*.
* gtypes.h: fixed GCompareDataFunc naming.
Wed Mar 7 09:33:27 2001 Tim Janik <timj@gtk.org>
* gobject/Makefile.am: shuffled rules to avoid excessive
rebuilds.
* gobject/gobject-sections.txt: updates.
* gobject/tmpl/*: bunch of updates, added another patch
from Eric Lemings <eric.b.lemings@lmco.com>.
2001-03-07 14:46:45 +00:00
|
|
|
GCompareDataFunc compare_func,
|
2000-11-20 23:59:32 +00:00
|
|
|
gpointer user_data)
|
|
|
|
{
|
2005-12-07 11:35:27 +00:00
|
|
|
return g_list_sort_real (list, (GFunc) compare_func, user_data);
|
1998-11-13 20:50:41 +00:00
|
|
|
}
|
1998-12-02 14:55:27 +00:00
|
|
|
|
2005-03-14 04:26:57 +00:00
|
|
|
#define __G_LIST_C__
|
|
|
|
#include "galiasdef.c"
|