luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-11 10:13:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant header inclusions

Browse Source
This commit is contained in:
Matthias Clasen 2010-09-03 20:15:16 -04:00
parent d95c6b8834
commit 8f81ee86ee
1 changed files with 170 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

203
glib/gslist.c
View File

@ -30,7 +30,8 @@
#include "config.h"
#include "glib.h"
#include "gslist.h"
#include "gtestutils.h"
/**
* SECTION: linked_lists_single
@ -221,7 +222,7 @@ g_slist_free_1 (GSList *list)
*/
GSList*
g_slist_append (GSList *list,
gpointer data)
gpointer data)
{
GSList *new_list;
GSList *last;
@ -265,7 +266,7 @@ g_slist_append (GSList *list,
*/
GSList*
g_slist_prepend (GSList *list,
gpointer data)
gpointer data)
{
GSList *new_list;
@ -291,8 +292,8 @@ g_slist_prepend (GSList *list,
*/
GSList*
g_slist_insert (GSList *list,
gpointer data,
gint position)
gpointer data,
gint position)
{
GSList *prev_list;
GSList *tmp_list;
@ -347,8 +348,8 @@ g_slist_insert (GSList *list,
*/
GSList*
g_slist_insert_before (GSList *slist,
GSList *sibling,
gpointer data)
GSList *sibling,
gpointer data)
{
if (!slist)
{
@ -363,25 +364,25 @@ g_slist_insert_before (GSList *slist,
GSList *node, *last = NULL;
for (node = slist; node; last = node, node = last->next)
if (node == sibling)
break;
if (node == sibling)
break;
if (!last)
{
node = _g_slist_alloc ();
node->data = data;
node->next = slist;
{
node = _g_slist_alloc ();
node->data = data;
node->next = slist;
return node;
}
return node;
}
else
{
node = _g_slist_alloc ();
node->data = data;
node->next = last->next;
last->next = node;
{
node = _g_slist_alloc ();
node->data = data;
node->next = last->next;
last->next = node;
return slist;
}
return slist;
}
}
}
@ -402,9 +403,9 @@ g_slist_concat (GSList *list1, GSList *list2)
if (list2)
{
if (list1)
g_slist_last (list1)->next = list2;
g_slist_last (list1)->next = list2;
else
list1 = list2;
list1 = list2;
}
return list1;
@ -423,7 +424,7 @@ g_slist_concat (GSList *list1, GSList *list2)
*/
GSList*
g_slist_remove (GSList *list,
gconstpointer data)
gconstpointer data)
{
GSList *tmp, *prev = NULL;
@ -431,15 +432,15 @@ g_slist_remove (GSList *list,
while (tmp)
{
if (tmp->data == data)
{
if (prev)
prev->next = tmp->next;
else
list = tmp->next;
{
if (prev)
prev->next = tmp->next;
else
list = tmp->next;
g_slist_free_1 (tmp);
break;
}
g_slist_free_1 (tmp);
break;
}
prev = tmp;
tmp = prev->next;
}
@ -461,7 +462,7 @@ g_slist_remove (GSList *list,
*/
GSList*
g_slist_remove_all (GSList *list,
gconstpointer data)
gconstpointer data)
{
GSList *tmp, *prev = NULL;
@ -469,22 +470,22 @@ g_slist_remove_all (GSList *list,
while (tmp)
{
if (tmp->data == data)
{
GSList *next = tmp->next;
{
GSList *next = tmp->next;
if (prev)
prev->next = next;
else
list = next;
if (prev)
prev->next = next;
else
list = next;
g_slist_free_1 (tmp);
tmp = next;
}
g_slist_free_1 (tmp);
tmp = next;
}
else
{
prev = tmp;
tmp = prev->next;
}
{
prev = tmp;
tmp = prev->next;
}
}
return list;
@ -492,7 +493,7 @@ g_slist_remove_all (GSList *list,
static inline GSList*
_g_slist_remove_link (GSList *list,
GSList *link)
GSList *link)
{
GSList *tmp;
GSList *prev;
@ -503,15 +504,15 @@ _g_slist_remove_link (GSList *list,
while (tmp)
{
if (tmp == link)
{
if (prev)
prev->next = tmp->next;
if (list == tmp)
list = list->next;
{
if (prev)
prev->next = tmp->next;
if (list == tmp)
list = list->next;
tmp->next = NULL;
break;
}
tmp->next = NULL;
break;
}
prev = tmp;
tmp = tmp->next;
@ -534,7 +535,7 @@ _g_slist_remove_link (GSList *list,
*/
GSList*
g_slist_remove_link (GSList *list,
GSList *link_)
GSList *link_)
{
return _g_slist_remove_link (list, link_);
}
@ -552,7 +553,7 @@ g_slist_remove_link (GSList *list,
*/
GSList*
g_slist_delete_link (GSList *list,
GSList *link_)
GSList *link_)
{
list = _g_slist_remove_link (list, link_);
_g_slist_free1 (link_);
@ -588,12 +589,12 @@ g_slist_copy (GSList *list)
last = new_list;
list = list->next;
while (list)
{
last->next = _g_slist_alloc ();
last = last->next;
last->data = list->data;
list = list->next;
}
{
last->next = _g_slist_alloc ();
last = last->next;
last->data = list->data;
list = list->next;
}
last->next = NULL;
}
@ -638,7 +639,7 @@ g_slist_reverse (GSList *list)
*/
GSList*
g_slist_nth (GSList *list,
guint n)
guint n)
{
while (n-- > 0 && list)
list = list->next;
@ -658,7 +659,7 @@ g_slist_nth (GSList *list,
*/
gpointer
g_slist_nth_data (GSList *list,
guint n)
guint n)
{
while (n-- > 0 && list)
list = list->next;
@ -679,12 +680,12 @@ g_slist_nth_data (GSList *list,
*/
GSList*
g_slist_find (GSList *list,
gconstpointer data)
gconstpointer data)
{
while (list)
{
if (list->data == data)
break;
break;
list = list->next;
}
@ -710,15 +711,15 @@ g_slist_find (GSList *list,
*/
GSList*
g_slist_find_custom (GSList *list,
gconstpointer data,
GCompareFunc func)
gconstpointer data,
GCompareFunc func)
{
g_return_val_if_fail (func != NULL, list);
while (list)
{
if (! func (list->data, data))
return list;
return list;
list = list->next;
}
@ -738,7 +739,7 @@ g_slist_find_custom (GSList *list,
*/
gint
g_slist_position (GSList *list,
GSList *llink)
GSList *llink)
{
gint i;
@ -746,7 +747,7 @@ g_slist_position (GSList *list,
while (list)
{
if (list == llink)
return i;
return i;
i++;
list = list->next;
}
@ -767,7 +768,7 @@ g_slist_position (GSList *list,
*/
gint
g_slist_index (GSList *list,
gconstpointer data)
gconstpointer data)
{
gint i;
@ -775,7 +776,7 @@ g_slist_index (GSList *list,
while (list)
{
if (list->data == data)
return i;
return i;
i++;
list = list->next;
}
@ -802,7 +803,7 @@ g_slist_last (GSList *list)
if (list)
{
while (list->next)
list = list->next;
list = list->next;
}
return list;
@ -846,8 +847,8 @@ g_slist_length (GSList *list)
*/
void
g_slist_foreach (GSList *list,
GFunc func,
gpointer user_data)
GFunc func,
gpointer user_data)
{
while (list)
{
@ -859,9 +860,9 @@ g_slist_foreach (GSList *list,
static GSList*
g_slist_insert_sorted_real (GSList *list,
gpointer data,
GFunc func,
gpointer user_data)
gpointer data,
GFunc func,
gpointer user_data)
{
GSList *tmp_list = list;
GSList *prev_list = NULL;
@ -950,18 +951,18 @@ g_slist_insert_sorted (GSList *list,
*/
GSList*
g_slist_insert_sorted_with_data (GSList *list,
gpointer data,
GCompareDataFunc func,
gpointer user_data)
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,
gpointer user_data)
GSList *l2,
GFunc compare_func,
gpointer user_data)
{
GSList list, *l;
gint cmp;
@ -974,13 +975,13 @@ g_slist_sort_merge (GSList *l1,
if (cmp <= 0)
{
l=l->next=l1;
l1=l1->next;
l=l->next=l1;
l1=l1->next;
}
else
{
l=l->next=l2;
l2=l2->next;
{
l=l->next=l2;
l2=l2->next;
}
}
l->next= l1 ? l1 : l2;
@ -990,8 +991,8 @@ g_slist_sort_merge (GSList *l1,
static GSList *
g_slist_sort_real (GSList *list,
GFunc compare_func,
gpointer user_data)
GFunc compare_func,
gpointer user_data)
{
GSList *l1, *l2;
@ -1006,16 +1007,16 @@ g_slist_sort_real (GSList *list,
while ((l2 = l2->next) != NULL)
{
if ((l2 = l2->next) == NULL)
break;
break;
l1=l1->next;
}
l2 = l1->next;
l1->next = NULL;
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,
user_data);
g_slist_sort_real (l2, compare_func, user_data),
compare_func,
user_data);
}
/**
@ -1033,7 +1034,7 @@ g_slist_sort_real (GSList *list,
*/
GSList *
g_slist_sort (GSList *list,
GCompareFunc compare_func)
GCompareFunc compare_func)
{
return g_slist_sort_real (list, (GFunc) compare_func, NULL);
}
@ -1050,8 +1051,8 @@ g_slist_sort (GSList *list,
*/
GSList *
g_slist_sort_with_data (GSList *list,
GCompareDataFunc compare_func,
gpointer user_data)
GCompareDataFunc compare_func,
gpointer user_data)
{
return g_slist_sort_real (list, (GFunc) compare_func, user_data);
}