X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Flist.h;h=60f9a4374a36776976a96cc4a55f81736ebb4389;hp=d06415216367a9c53683c70473018b46ba565c46;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=158cbe99f972a1613b7d4d95abfe5fe48e019e67 diff --git a/src/list.h b/src/list.h index d0641521..60f9a437 100644 --- a/src/list.h +++ b/src/list.h @@ -1,6 +1,9 @@ +#ifndef MESHLINK_LIST_H +#define MESHLINK_LIST_H + /* list.h -- header file for list.c - Copyright (C) 2014 Guus Sliepen + Copyright (C) 2014, 2017 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,9 +20,6 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __TINC_LIST_H__ -#define __TINC_LIST_H__ - typedef struct list_node_t { struct list_node_t *prev; struct list_node_t *next; @@ -35,7 +35,7 @@ typedef void (*list_action_node_t)(const list_node_t *); typedef struct list_t { list_node_t *head; list_node_t *tail; - int count; + unsigned int count; /* Callbacks */ @@ -44,21 +44,16 @@ typedef struct list_t { /* (De)constructors */ -extern list_t *list_alloc(list_action_t) __attribute__ ((__malloc__)); +extern list_t *list_alloc(list_action_t) __attribute__((__malloc__)); extern void list_free(list_t *); -extern list_node_t *list_alloc_node(void); -extern void list_free_node(list_t *, list_node_t *); /* Insertion and deletion */ extern list_node_t *list_insert_head(list_t *, void *); extern list_node_t *list_insert_tail(list_t *, void *); -extern list_node_t *list_insert_after(list_t *, list_node_t *, void *); -extern list_node_t *list_insert_before(list_t *, list_node_t *, void *); extern void list_delete(list_t *, const void *); -extern void list_unlink_node(list_t *, list_node_t *); extern void list_delete_node(list_t *, list_node_t *); extern void list_delete_head(list_t *); @@ -80,4 +75,4 @@ extern void list_foreach_node(list_t *, list_action_node_t); #define list_each(type, item, list) (type *item = (type *)1; item; item = NULL) for(list_node_t *node = (list)->head, *next; item = node ? node->data : NULL, next = node ? node->next : NULL, node; node = next) -#endif /* __TINC_LIST_H__ */ +#endif