From bfd388c026e6aeb5427df50347b59d62feb3072e Mon Sep 17 00:00:00 2001 From: antoine Date: Mon, 28 Dec 2009 22:56:30 +0000 Subject: (S)LIST_HEAD_INITIALIZER takes a (S)LIST_HEAD as an argument. Fix some wrong usages. Note: this does not affect generated binaries as this argument is not used. PR: 137213 Submitted by: Eygene Ryabinkin (initial version) MFC after: 1 month --- sbin/fsck_ffs/gjournal.c | 2 +- sbin/ggate/ggated/ggated.c | 4 ++-- sbin/natd/natd.c | 2 +- sbin/routed/if.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sbin') diff --git a/sbin/fsck_ffs/gjournal.c b/sbin/fsck_ffs/gjournal.c index 903763d..bd887ca 100644 --- a/sbin/fsck_ffs/gjournal.c +++ b/sbin/fsck_ffs/gjournal.c @@ -86,7 +86,7 @@ struct cgchain { #define MAX_CACHED_CGS 1024 static unsigned ncgs = 0; -static LIST_HEAD(, cgchain) cglist = LIST_HEAD_INITIALIZER(&cglist); +static LIST_HEAD(, cgchain) cglist = LIST_HEAD_INITIALIZER(cglist); static const char *devnam; static struct uufsd *disk = NULL; diff --git a/sbin/ggate/ggated/ggated.c b/sbin/ggate/ggated/ggated.c index 52d2428..3b2a0a5 100644 --- a/sbin/ggate/ggated/ggated.c +++ b/sbin/ggate/ggated/ggated.c @@ -99,8 +99,8 @@ static TAILQ_HEAD(, ggd_request) outqueue = TAILQ_HEAD_INITIALIZER(outqueue); pthread_mutex_t inqueue_mtx, outqueue_mtx; pthread_cond_t inqueue_cond, outqueue_cond; -static SLIST_HEAD(, ggd_export) exports = SLIST_HEAD_INITIALIZER(&exports); -static LIST_HEAD(, ggd_connection) connections = LIST_HEAD_INITIALIZER(&connection); +static SLIST_HEAD(, ggd_export) exports = SLIST_HEAD_INITIALIZER(exports); +static LIST_HEAD(, ggd_connection) connections = LIST_HEAD_INITIALIZER(connections); static void *recv_thread(void *arg); static void *disk_thread(void *arg); diff --git a/sbin/natd/natd.c b/sbin/natd/natd.c index 445077f..f6b3fdb 100644 --- a/sbin/natd/natd.c +++ b/sbin/natd/natd.c @@ -68,7 +68,7 @@ struct instance { int divertInOut; }; -static LIST_HEAD(, instance) root = LIST_HEAD_INITIALIZER(&root); +static LIST_HEAD(, instance) root = LIST_HEAD_INITIALIZER(root); struct libalias *mla; struct instance *mip; diff --git a/sbin/routed/if.c b/sbin/routed/if.c index 61ac412..1c185d7 100644 --- a/sbin/routed/if.c +++ b/sbin/routed/if.c @@ -42,7 +42,7 @@ __RCSID("$Revision: 2.27 $"); #endif struct ifhead ifnet = LIST_HEAD_INITIALIZER(ifnet); /* all interfaces */ -struct ifhead remote_if = LIST_HEAD_INITIALIZER(ifnet); /* remote interfaces */ +struct ifhead remote_if = LIST_HEAD_INITIALIZER(remote_if); /* remote interfaces */ /* hash table for all interfaces, big enough to tolerate ridiculous * numbers of IP aliases. Crazy numbers of aliases such as 7000 -- cgit v1.1