diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2014-10-23 19:56:19 -0400 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2014-10-23 19:14:06 -0500 |
| commit | 6ca79042b9aa9752e577346e6f355356ef8f2f9a (patch) | |
| tree | 1b2c101abfb41fa69a906a4bcfde41a0c53a3363 | |
| parent | 1e0a4bebdefd06af09ba8f2459287d3ca28f89d7 (diff) | |
helpers.h, start-stop-daemon.c: remove uneeded macros
TAILQ_CONCAT, TAILQ_FOREACH_SAFE and LIST_FOREACH_SAFE are defined
in our bundled queue.h and are no longer required.
| -rw-r--r-- | src/includes/helpers.h | 19 | ||||
| -rw-r--r-- | src/rc/start-stop-daemon.c | 9 |
2 files changed, 0 insertions, 28 deletions
diff --git a/src/includes/helpers.h b/src/includes/helpers.h index 94e59a83..43528588 100644 --- a/src/includes/helpers.h +++ b/src/includes/helpers.h @@ -48,25 +48,6 @@ #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) -/* Some libc implemntations don't have these */ -#ifndef TAILQ_CONCAT -#define TAILQ_CONCAT(head1, head2, field) do { \ - if (!TAILQ_EMPTY(head2)) { \ - *(head1)->tqh_last = (head2)->tqh_first; \ - (head2)->tqh_first->field.tqe_prev = (head1)->tqh_last; \ - (head1)->tqh_last = (head2)->tqh_last; \ - TAILQ_INIT((head2)); \ - } \ - } while (0) -#endif - -#ifndef TAILQ_FOREACH_SAFE -#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \ - for ((var) = TAILQ_FIRST((head)); \ - (var) && ((tvar) = TAILQ_NEXT((var), field), 1); \ - (var) = (tvar)) -#endif - #ifdef __GLIBC__ # if ! defined (__UCLIBC__) && ! defined (__dietlibc__) # define strlcpy(dst, src, size) snprintf(dst, size, "%s", src) diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c index 14124491..6229bbfd 100644 --- a/src/rc/start-stop-daemon.c +++ b/src/rc/start-stop-daemon.c @@ -78,15 +78,6 @@ static struct pam_conv conv = { NULL, NULL}; #include "rc.h" #include "rc-misc.h" -/* Some libc implementations don't define this */ -#ifndef LIST_FOREACH_SAFE -#define LIST_FOREACH_SAFE(var, head, field, tvar) \ - for ((var) = LIST_FIRST((head)); \ - (var) && ((tvar) = LIST_NEXT((var), field), 1); \ - (var) = (tvar)) -#endif - - typedef struct scheduleitem { enum |