diff options
author | Trent Lloyd <lathiat@bur.st> | 2005-08-08 18:03:51 +0000 |
---|---|---|
committer | Trent Lloyd <lathiat@bur.st> | 2005-08-08 18:03:51 +0000 |
commit | 7540df5ed6b383ec93f5a4f10ab2d08f9b9869e4 (patch) | |
tree | e2e023eabbf40d5ffa8716ba5985e25d440b3885 /avahi-common | |
parent | 9ad2a95c80ab0f9cf48d3f58e9a7ed6f06685c34 (diff) |
* Move avahi-core/llist.h to avahi-common/llist.h, not installed.
* avahi-client/
- Add copyright notice
- Remove glib, various cleanups
- Remove alternative host/service functions (available in avahi-common)
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@275 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-common')
-rw-r--r-- | avahi-common/Makefile.am | 2 | ||||
-rw-r--r-- | avahi-common/llist.h | 71 |
2 files changed, 73 insertions, 0 deletions
diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am index c327bd1..b96d19e 100644 --- a/avahi-common/Makefile.am +++ b/avahi-common/Makefile.am @@ -40,6 +40,8 @@ if ENABLE_DBUS avahi_commoninclude_HEADERS += dbus.h endif +noinst_HEADERS = llist.h + noinst_PROGRAMS = \ strlst-test \ domain-test \ diff --git a/avahi-common/llist.h b/avahi-common/llist.h new file mode 100644 index 0000000..7c28f31 --- /dev/null +++ b/avahi-common/llist.h @@ -0,0 +1,71 @@ +#ifndef foollistfoo +#define foollistfoo + +/* $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 <glib.h> + +/* Some macros for maintaining doubly linked lists */ + +/* The head of the linked list. Use this in the structure that shall + * contain the head of the linked list */ +#define AVAHI_LLIST_HEAD(t,name) t *name + +/* The pointers in the linked list's items. Use this in the item structure */ +#define AVAHI_LLIST_FIELDS(t,name) t *name##_next, *name##_prev + +/* Initialize the list's head */ +#define AVAHI_LLIST_HEAD_INIT(t,head) do { (head) = NULL; } while(0) + +/* Initialize a list item */ +#define AVAHI_LLIST_INIT(t,name,item) do { \ + t *_item = (item); \ + g_assert(_item); \ + _item->name##_prev = _item->name##_next = NULL; \ + } while(0) + +/* Prepend an item to the list */ +#define AVAHI_LLIST_PREPEND(t,name,head,item) do { \ + t **_head = &(head), *_item = (item); \ + g_assert(_item); \ + if ((_item->name##_next = *_head)) \ + _item->name##_next->name##_prev = _item; \ + _item->name##_prev = NULL; \ + *_head = _item; \ + } while (0) + +/* Remove an item from the list */ +#define AVAHI_LLIST_REMOVE(t,name,head,item) do { \ + t **_head = &(head), *_item = (item); \ + g_assert(_item); \ + if (_item->name##_next) \ + _item->name##_next->name##_prev = _item->name##_prev; \ + if (_item->name##_prev) \ + _item->name##_prev->name##_next = _item->name##_next; \ + else {\ + g_assert(*_head == _item); \ + *_head = _item->name##_next; \ + } \ + _item->name##_next = _item->name##_prev = NULL; \ + } while(0) + +#endif |