projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check for get_current_dir_name. There is a replacement function in
[tinc]
/
lib
/
list.c
diff --git
a/lib/list.c
b/lib/list.c
index
6ade9e8
..
f509e21
100644
(file)
--- a/
lib/list.c
+++ b/
lib/list.c
@@
-17,16
+17,15
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: list.c,v 1.1.2.
3 2000/11/20 22:13:00
guus Exp $
+ $Id: list.c,v 1.1.2.
6 2000/11/22 23:09:38
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
-#include <
malloc
.h>
+#include <
stdlib
.h>
#include <string.h>
#include <syslog.h>
#include <string.h>
#include <syslog.h>
-#include <error.h>
#include <list.h>
#include <xalloc.h>
#include <list.h>
#include <xalloc.h>
@@
-50,14
+49,10
@@
list_t *list_new(void)
Delete the element pointed to by idx from the list.
*/
Delete the element pointed to by idx from the list.
*/
-
list_node_t *
list_delete(list_t *list, list_node_t *idx)
+
void
list_delete(list_t *list, list_node_t *idx)
{
{
- list_node_t *res;
-
- if(!list)
- return NULL;
- if(!idx)
- return NULL;
+ if(!list || !idx)
+ return;
if(list->callbacks->delete != NULL)
if(list->callbacks->delete(idx->data))
if(list->callbacks->delete != NULL)
if(list->callbacks->delete(idx->data))
@@
-68,13
+63,11
@@
list_node_t *list_delete(list_t *list, list_node_t *idx)
if(idx->prev == NULL)
/* First element in list */
{
if(idx->prev == NULL)
/* First element in list */
{
- res = idx->next;
list->head = idx->next;
}
if(idx->next == NULL)
/* Last element in list */
{
list->head = idx->next;
}
if(idx->next == NULL)
/* Last element in list */
{
- res = NULL;
list->tail = idx->prev;
}
if(idx->prev != NULL && idx->next != NULL)
list->tail = idx->prev;
}
if(idx->prev != NULL && idx->next != NULL)
@@
-88,8
+81,8
@@
list_node_t *list_delete(list_t *list, list_node_t *idx)
else
if(list->tail == NULL)
list->head = NULL;
else
if(list->tail == NULL)
list->head = NULL;
+
free(idx);
free(idx);
- return res;
}
/*
}
/*
@@
-100,7
+93,7
@@
list_node_t *list_delete(list_t *list, list_node_t *idx)
*/
void list_forall_nodes(list_t *list, int (*function)(void *data))
{
*/
void list_forall_nodes(list_t *list, int (*function)(void *data))
{
- list_node_t *p;
+ list_node_t *p
, *next
;
int res;
if(!list) /* no list given */
int res;
if(!list) /* no list given */
@@
-109,11
+102,12
@@
void list_forall_nodes(list_t *list, int (*function)(void *data))
return;
if(!list->head) /* list is empty */
return;
return;
if(!list->head) /* list is empty */
return;
- for(p = list->head; p != NULL; p =
p->
next)
+ for(p = list->head; p != NULL; p = next)
{
{
+ next = p->next;
res = function(p->data);
if(res != 0)
res = function(p->data);
if(res != 0)
-
p =
list_delete(list, p);
+ list_delete(list, p);
}
}
}
}