diff options
| -rw-r--r-- | avahi-common/Makefile.am | 12 | ||||
| -rw-r--r-- | avahi-common/rlist.c | 64 | ||||
| -rw-r--r-- | avahi-common/rlist.h | 38 |
3 files changed, 108 insertions, 6 deletions
diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am index a580a9d..e1786f7 100644 --- a/avahi-common/Makefile.am +++ b/avahi-common/Makefile.am @@ -36,10 +36,9 @@ avahi_commoninclude_HEADERS = \ timeval.h \ simple-watch.h \ gccmacro.h \ - error.h - -noinst_HEADERS = \ - llist.h + error.h \ + llist.h \ + rlist.h noinst_PROGRAMS = \ strlst-test \ @@ -60,7 +59,8 @@ libavahi_common_la_SOURCES = \ domain.c domain.h \ timeval.c timeval.h \ simple-watch.c simple-watch.h \ - watch.h gccmacro.h + watch.h gccmacro.h \ + rlist.h rlist.c libavahi_common_la_CFLAGS = $(AM_CFLAGS) libavahi_common_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_COMMON_VERSION_INFO) 1:0:1 @@ -99,7 +99,7 @@ timeval_test_CFLAGS = $(AM_CFLAGS) if HAVE_DBUS -noinst_HEADERS += \ +noinst_HEADERS = \ dbus.h \ dbus-watch-glue.h diff --git a/avahi-common/rlist.c b/avahi-common/rlist.c new file mode 100644 index 0000000..f24ab03 --- /dev/null +++ b/avahi-common/rlist.c @@ -0,0 +1,64 @@ +/* $Id$ */ + +/*** + This file is part of avahi. + + avahi is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + avahi is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General + Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with avahi; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. +***/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <stdlib.h> + +#include "rlist.h" +#include "malloc.h" + +AvahiRList* avahi_rlist_prepend(AvahiRList *r, void *data) { + AvahiRList *n; + + if (!(n = avahi_new(AvahiRList, 1))) + return NULL; + + n->data = data; + + AVAHI_LLIST_PREPEND(AvahiRList, rlist, r, n); + return r; +} + +AvahiRList* avahi_rlist_remove(AvahiRList *r, void *data) { + AvahiRList *n; + + for (n = r; n; n = n->rlist_next) + + if (n->data == data) { + AVAHI_LLIST_REMOVE(AvahiRList, rlist, r, n); + avahi_free(n); + break; + } + + return r; +} + +AvahiRList* avahi_rlist_remove_by_link(AvahiRList *r, AvahiRList *n) { + assert(n); + + AVAHI_LLIST_REMOVE(AvahiRList, rlist, r, n); + avahi_free(n); + + return r; +} diff --git a/avahi-common/rlist.h b/avahi-common/rlist.h new file mode 100644 index 0000000..96c03f1 --- /dev/null +++ b/avahi-common/rlist.h @@ -0,0 +1,38 @@ +#ifndef foorlistfoo +#define foorlistfoo + +/* $Id$ */ + +/*** + This file is part of avahi. + + avahi is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + avahi is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General + Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with avahi; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. +***/ + +#include "llist.h" + +typedef struct AvahiRList AvahiRList; + +struct AvahiRList { + AVAHI_LLIST_FIELDS(AvahiRList, rlist); + void *data; +}; + +AvahiRList* avahi_rlist_prepend(AvahiRList *r, void *data); +AvahiRList* avahi_rlist_remove(AvahiRList *r, void *data); +AvahiRList* avahi_rlist_remove_by_link(AvahiRList *r, AvahiRList *n); + +#endif |