picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

list: make LIST_FIND_TAIL work for empty lists

Browse source
This commit is contained in:
Lennart Poettering 2014-05-06 13:07:15 +02:00
parent 2db3e2023d
commit 376cd3b89c
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/shared/list.h
View file

@ -75,20 +75,26 @@
#define LIST_FIND_HEAD(name,item,head) \
do { \
typeof(*(item)) *_item = (item); \
assert(_item); \
while (_item->name##_prev) \
_item = _item->name##_prev; \
(head) = _item; \
if (!_item) \
(head) = NULL; \
else { \
while (_item->name##_prev) \
_item = _item->name##_prev; \
(head) = _item; \
} \
} while (false)
/* Find the tail of the list */
#define LIST_FIND_TAIL(name,item,tail) \
do { \
typeof(*(item)) *_item = (item); \
assert(_item); \
while (_item->name##_next) \
_item = _item->name##_next; \
(tail) = _item; \
if (!_item) \
(tail) = NULL; \
else { \
while (_item->name##_next) \
_item = _item->name##_next; \
(tail) = _item; \
} \
} while (false)
/* Insert an item after another one (a = where, b = what) */

9
src/timesync/timesyncd.c
View file

@ -335,7 +335,7 @@ static int manager_clock_watch_setup(Manager *m) {
assert(m);
m->event_clock_watch = sd_event_source_unref(m->event_clock_watch);
m->clock_watch_fd = safe_close(m->clock_watch_fd);
safe_close(m->clock_watch_fd);
m->clock_watch_fd = timerfd_create(CLOCK_REALTIME, TFD_NONBLOCK|TFD_CLOEXEC);
if (m->clock_watch_fd < 0) {
@ -950,11 +950,8 @@ static int manager_add_server(Manager *m, const char *server) {
return -ENOMEM;
}
if (m->servers) {
LIST_FIND_TAIL(names, m->servers, tail);
LIST_INSERT_AFTER(names, m->servers, tail, n);
} else
LIST_PREPEND(names, m->servers, n);
LIST_FIND_TAIL(names, m->servers, tail);
LIST_INSERT_AFTER(names, m->servers, tail, n);
return 0;
}