Menu
▾
▴
E CVS: libs/ewd rbdpngn
|
From: <enl...@li...> - 2001-06-12 19:32:26
|
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewd
Dir : e17/libs/ewd/src
Modified Files:
ewd_list.c
Log Message:
Fixed up a small bug in the list code that had some annoying side effects.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewd/src/ewd_list.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewd_list.c 2001/05/04 01:58:05 1.7
+++ ewd_list.c 2001/06/12 19:32:25 1.8
@@ -49,7 +49,7 @@
CHECK_PARAM_POINTER("list", list);
- EWD_WRITE_LOCK_STRUCT(list);
+ EWD_WRITE_LOCK(list);
while (list->first) {
data = _ewd_list_remove_first(list);
@@ -57,7 +57,7 @@
list->free_func(data);
}
- EWD_WRITE_UNLOCK_STRUCT(list);
+ EWD_WRITE_UNLOCK(list);
EWD_DESTROY_LOCKS(list);
FREE(list);
@@ -76,11 +76,11 @@
{
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- EWD_WRITE_LOCK_STRUCT(list);
+ EWD_WRITE_LOCK(list);
list->free_func = free_func;
- EWD_WRITE_UNLOCK_STRUCT(list);
+ EWD_WRITE_UNLOCK(list);
return TRUE;
}
@@ -96,12 +96,12 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- EWD_READ_LOCK_STRUCT(list);
+ EWD_READ_LOCK(list);
if (list->nodes)
ret = FALSE;
- EWD_READ_UNLOCK_STRUCT(list);
+ EWD_READ_UNLOCK(list);
return ret;
}
@@ -117,11 +117,11 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- EWD_READ_LOCK_STRUCT(list);
+ EWD_READ_LOCK(list);
ret = list->index;
- EWD_READ_UNLOCK_STRUCT(list);
+ EWD_READ_UNLOCK(list);
return ret;
}
@@ -137,11 +137,11 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- EWD_READ_LOCK_STRUCT(list);
+ EWD_READ_LOCK(list);
ret = list->nodes;
- EWD_READ_UNLOCK_STRUCT(list);
+ EWD_READ_UNLOCK(list);
return ret;
}
@@ -158,11 +158,11 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- EWD_WRITE_LOCK_STRUCT(list);
+ EWD_WRITE_LOCK(list);
ret = _ewd_list_append(list, data);
- EWD_WRITE_UNLOCK_STRUCT(list);
+ EWD_WRITE_UNLOCK(list);
return ret;
}
@@ -180,14 +180,14 @@
return FALSE;
if (list->last) {
- EWD_WRITE_LOCK_STRUCT(list->last);
+ EWD_WRITE_LOCK(list->last);
list->last->next = end;
- EWD_WRITE_UNLOCK_STRUCT(list->last);
+ EWD_WRITE_UNLOCK(list->last);
}
- EWD_WRITE_LOCK_STRUCT(end);
+ EWD_WRITE_LOCK(end);
end->data = data;
- EWD_WRITE_UNLOCK_STRUCT(end);
+ EWD_WRITE_UNLOCK(end);
list->last = end;
@@ -213,9 +213,9 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- EWD_WRITE_LOCK_STRUCT(list);
+ EWD_WRITE_LOCK(list);
ret = _ewd_list_prepend(list, data);
- EWD_WRITE_UNLOCK_STRUCT(list);
+ EWD_WRITE_UNLOCK(list);
return ret;
}
@@ -234,10 +234,10 @@
return FALSE;
/* Put it at the beginning of the list */
- EWD_WRITE_LOCK_STRUCT(start);
+ EWD_WRITE_LOCK(start);
start->next = list->first;
start->data = data;
- EWD_WRITE_UNLOCK_STRUCT(start);
+ EWD_WRITE_UNLOCK(start);
list->first = start;
@@ -267,9 +267,9 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- EWD_WRITE_LOCK_STRUCT(list);
+ EWD_WRITE_LOCK(list);
ret = _ewd_list_insert(list, data);
- EWD_WRITE_UNLOCK_STRUCT(list);
+ EWD_WRITE_UNLOCK(list);
return ret;
}
@@ -297,17 +297,17 @@
return FALSE;
/* Setup the fields of the new node */
- EWD_WRITE_LOCK_STRUCT(new);
+ EWD_WRITE_LOCK(new);
new->data = data;
new->next = list->current;
- EWD_WRITE_UNLOCK_STRUCT(new);
+ EWD_WRITE_UNLOCK(new);
/* And hook the node into the list */
_ewd_list_goto_index(list, ewd_list_index(list) - 1);
- EWD_WRITE_LOCK_STRUCT(list->current);
+ EWD_WRITE_LOCK(list->current);
list->current->next = new;
- EWD_WRITE_UNLOCK_STRUCT(list->current);
+ EWD_WRITE_UNLOCK(list->current);
list->current = new;
list->index++;
@@ -327,9 +327,9 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- EWD_WRITE_LOCK_STRUCT(list);
+ EWD_WRITE_LOCK(list);
ret = _ewd_list_remove(list);
- EWD_WRITE_UNLOCK_STRUCT(list);
+ EWD_WRITE_UNLOCK(list);
return ret;
}
@@ -359,8 +359,8 @@
_ewd_list_goto_index(list, list->index - 1);
- EWD_WRITE_LOCK_STRUCT(list->current);
- EWD_WRITE_LOCK_STRUCT(old);
+ EWD_WRITE_LOCK(list->current);
+ EWD_WRITE_LOCK(old);
list->current->next = old->next;
old->next = NULL;
@@ -369,8 +369,8 @@
_ewd_list_next(list);
- EWD_WRITE_UNLOCK_STRUCT(old);
- EWD_WRITE_UNLOCK_STRUCT(list->current);
+ EWD_WRITE_UNLOCK(old);
+ EWD_WRITE_UNLOCK(list->current);
ewd_list_node_destroy(old, NULL);
list->nodes--;
@@ -389,12 +389,12 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- EWD_WRITE_LOCK_STRUCT(list);
+ EWD_WRITE_LOCK(list);
data = _ewd_list_remove(list);
if (list->free_func)
list->free_func(data);
- EWD_WRITE_UNLOCK_STRUCT(list);
+ EWD_WRITE_UNLOCK(list);
return TRUE;
}
@@ -410,9 +410,9 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- EWD_WRITE_LOCK_STRUCT(list);
+ EWD_WRITE_LOCK(list);
ret = _ewd_list_remove_first(list);
- EWD_WRITE_UNLOCK_STRUCT(list);
+ EWD_WRITE_UNLOCK(list);
return ret;
}
@@ -426,8 +426,10 @@
if (!list)
return FALSE;
+ EWD_WRITE_UNLOCK(list);
if (ewd_list_is_empty(list))
return FALSE;
+ EWD_WRITE_LOCK(list);
if (!list->first)
return FALSE;
@@ -444,10 +446,10 @@
if (list->last == old)
list->last = list->first;
- EWD_WRITE_LOCK_STRUCT(old);
+ EWD_WRITE_LOCK(old);
ret = old->data;
old->data = NULL;
- EWD_WRITE_UNLOCK_STRUCT(old);
+ EWD_WRITE_UNLOCK(old);
ewd_list_node_destroy(old, NULL);
list->nodes--;
@@ -466,9 +468,9 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- EWD_WRITE_LOCK_STRUCT(list);
+ EWD_WRITE_LOCK(list);
ret = _ewd_list_remove_last(list);
- EWD_WRITE_UNLOCK_STRUCT(list);
+ EWD_WRITE_UNLOCK(list);
return ret;
}
@@ -497,13 +499,13 @@
else
list->first = list->current = list->last = NULL;
- EWD_WRITE_LOCK_STRUCT(old);
+ EWD_WRITE_LOCK(old);
if (old) {
old->next = NULL;
ret = old->data;
old->data = NULL;
}
- EWD_WRITE_UNLOCK_STRUCT(old);
+ EWD_WRITE_UNLOCK(old);
ewd_list_node_destroy(old, NULL);
list->nodes--;
@@ -523,9 +525,9 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- EWD_WRITE_LOCK_STRUCT(list);
+ EWD_WRITE_LOCK(list);
ret = _ewd_list_goto_index(list, index);
- EWD_WRITE_UNLOCK_STRUCT(list);
+ EWD_WRITE_UNLOCK(list);
return ret;
}
@@ -566,9 +568,9 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- EWD_WRITE_LOCK_STRUCT(list);
+ EWD_WRITE_LOCK(list);
ret = _ewd_list_goto(list, data);
- EWD_WRITE_UNLOCK_STRUCT(list);
+ EWD_WRITE_UNLOCK(list);
return ret;
}
@@ -585,7 +587,7 @@
index = 1;
node = list->first;
- EWD_READ_LOCK_STRUCT(node);
+ EWD_READ_LOCK(node);
while (node && node->data) {
Ewd_List_Node *next;
@@ -593,15 +595,15 @@
break;
next = node->next;
- EWD_READ_UNLOCK_STRUCT(node);
+ EWD_READ_UNLOCK(node);
node = next;
- EWD_READ_LOCK_STRUCT(node);
+ EWD_READ_LOCK(node);
index++;
}
- EWD_READ_UNLOCK_STRUCT(node);
+ EWD_READ_UNLOCK(node);
if (!node)
return FALSE;
@@ -622,11 +624,11 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- EWD_WRITE_LOCK_STRUCT(list);
+ EWD_WRITE_LOCK(list);
ret = _ewd_list_goto_first(list);
- EWD_WRITE_UNLOCK_STRUCT(list);
+ EWD_WRITE_UNLOCK(list);
return ret;
}
@@ -654,9 +656,9 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- EWD_WRITE_LOCK_STRUCT(list);
+ EWD_WRITE_LOCK(list);
ret = _ewd_list_goto_last(list);
- EWD_WRITE_UNLOCK_STRUCT(list);
+ EWD_WRITE_UNLOCK(list);
return ret;
}
@@ -684,9 +686,9 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- EWD_READ_LOCK_STRUCT(list);
+ EWD_READ_LOCK(list);
ret = _ewd_list_current(list);
- EWD_READ_UNLOCK_STRUCT(list);
+ EWD_READ_UNLOCK(list);
return ret;
}
@@ -699,9 +701,9 @@
if (!list->current)
return NULL;
- EWD_READ_LOCK_STRUCT(list->current);
+ EWD_READ_LOCK(list->current);
ret = list->current->data;
- EWD_READ_UNLOCK_STRUCT(list->current);
+ EWD_READ_UNLOCK(list->current);
return ret;
}
@@ -717,9 +719,9 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- EWD_WRITE_LOCK_STRUCT(list);
+ EWD_WRITE_LOCK(list);
data = _ewd_list_next(list);
- EWD_WRITE_UNLOCK_STRUCT(list);
+ EWD_WRITE_UNLOCK(list);
return data;
}
@@ -734,17 +736,17 @@
if (!list->current)
return NULL;
- EWD_READ_LOCK_STRUCT(list->current);
+ EWD_READ_LOCK(list->current);
ret = list->current;
next = list->current->next;
- EWD_READ_UNLOCK_STRUCT(list->current);
+ EWD_READ_UNLOCK(list->current);
list->current = next;
list->index++;
- EWD_READ_LOCK_STRUCT(ret);
+ EWD_READ_LOCK(ret);
data = ret->data;
- EWD_READ_UNLOCK_STRUCT(ret);
+ EWD_READ_UNLOCK(ret);
return data;
}
@@ -759,7 +761,7 @@
void *data;
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- EWD_WRITE_LOCK_STRUCT(list);
+ EWD_WRITE_LOCK(list);
if (ewd_list_is_empty(list))
return TRUE;
@@ -772,7 +774,7 @@
list->free_func(data);
}
- EWD_WRITE_UNLOCK_STRUCT(list);
+ EWD_WRITE_UNLOCK(list);
return TRUE;
}
@@ -789,9 +791,9 @@
CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- EWD_READ_LOCK_STRUCT(list);
+ EWD_READ_LOCK(list);
ret = _ewd_list_for_each(list, function);
- EWD_READ_UNLOCK_STRUCT(list);
+ EWD_READ_UNLOCK(list);
return ret;
}
@@ -855,12 +857,12 @@
{
CHECK_PARAM_POINTER_RETURN("node", node, FALSE);
- EWD_WRITE_LOCK_STRUCT(node);
+ EWD_WRITE_LOCK(node);
if (free_func && node->data)
free_func(node->data);
- EWD_WRITE_UNLOCK_STRUCT(node);
+ EWD_WRITE_UNLOCK(node);
EWD_DESTROY_LOCKS(node);
FREE(node);
|
