Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 6338a74f 6338a74f3acedb4f6d1113ef70b528f2b7a94b7c by Sergey Poznyakoff
Options

(list_insert): Accept additional 

argument indicating whether to insert item before or after the
reference one.
1 parent 79436259
Inline Side-by-side
Showing 2 changed files with 47 additions and 22 deletions
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000 Free Software Foundation, Inc.
Copyright (C) 1999, 2000, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
......@@ -29,7 +29,8 @@ extern int list_create __P ((list_t *));
extern void list_destroy __P ((list_t *));
extern int list_append __P ((list_t, void *item));
extern int list_prepend __P ((list_t, void *item));
extern int list_insert __P ((list_t list, void *item, void *new_item));
extern int list_insert __P ((list_t list, void *item, void *new_item,
int insert_before));
extern int list_is_empty __P ((list_t));
extern int list_count __P ((list_t, size_t *pcount));
extern int list_remove __P ((list_t, void *item));
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
Copyright (C) 1999, 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
......@@ -185,29 +185,31 @@ list_locate (list_t list, void *item, void **ret_item)
return status;
}
int
list_insert (list_t list, void *item, void *new_item)
static int
_insert_item(list_t list, struct list_data *current, void *new_item,
int insert_before)
{
struct list_data *current;
list_comparator_t comp;
int status = MU_ERR_NOENT;
if (list == NULL)
return EINVAL;
comp = list->comp ? list->comp : def_comp;
monitor_wrlock (list->monitor);
for (current = list->head.next;
current != &(list->head);
current = current->next)
{
if (comp (current->item, item) == 0)
{
struct list_data *ldata = calloc (sizeof (*ldata), 1);
if (ldata == NULL)
return ENOMEM;
ldata->item = new_item;
if (insert_before)
{
ldata->prev = current->prev;
ldata->next = current;
if (current->prev)
current->prev->next = ldata;
else
list->head.next = ldata;
if (current == list->head.prev)
list->head.prev = ldata;
else
current->prev = ldata;
}
else
{
ldata->next = current->next;
ldata->prev = current;
if (current->next)
......@@ -216,12 +218,34 @@ list_insert (list_t list, void *item, void *new_item)
list->head.prev = ldata;
if (current == list->head.next)
current = list->head.next = ldata;
list->head.next = ldata;
else
current->next = ldata;
}
list->count++;
status = 0;
return 0;
}
int
list_insert (list_t list, void *item, void *new_item, int insert_before)
{
struct list_data *current;
list_comparator_t comp;
int status = MU_ERR_NOENT;
if (list == NULL)
return EINVAL;
comp = list->comp ? list->comp : def_comp;
monitor_wrlock (list->monitor);
for (current = list->head.next;
current != &(list->head);
current = current->next)
{
if (comp (current->item, item) == 0)
{
status = _insert_item (list, current, new_item, insert_before);
break;
}
}
......