list.h: Convert INIT_LIST_HEAD macro to inline function.

Inline functions are easier to read and write, and we get type
safety.

diff --git a/afs.c b/afs.c
index c4de2e8f37d5a94937f0fe3519715d40242f5329..a219c2dd1eb1b10744ee15381560fc7cd2fe3039 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -981,7 +981,7 @@ __noreturn void afs_init(int socket_fd)
        int i, ret;
 
        register_signal_task(&s);
        int i, ret;
 
        register_signal_task(&s);

-       INIT_LIST_HEAD(&afs_client_list);
+       init_list_head(&afs_client_list);

        for (i = 0; i < NUM_AFS_TABLES; i++)
                afs_tables[i].init(&afs_tables[i]);
        ret = open_afs_tables();
        for (i = 0; i < NUM_AFS_TABLES; i++)
                afs_tables[i].init(&afs_tables[i]);
        ret = open_afs_tables();

diff --git a/buffer_tree.c b/buffer_tree.c
index 8a3175133e69aa57eff7da5155341cbf05532d03..f0d2002d13c28b31c17f7130a4f3c34fc858bd58 100644 (file)
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -270,8 +270,8 @@ struct btr_node *btr_new_node(struct btr_node_description *bnd)
        btrn->context = bnd->context;
        btrn->start.tv_sec = 0;
        btrn->start.tv_usec = 0;
        btrn->context = bnd->context;
        btrn->start.tv_sec = 0;
        btrn->start.tv_usec = 0;

-       INIT_LIST_HEAD(&btrn->children);
-       INIT_LIST_HEAD(&btrn->input_queue);
+       init_list_head(&btrn->children);
+       init_list_head(&btrn->input_queue);

        if (!bnd->child) {
                if (bnd->parent) {
                        list_add_tail(&btrn->node, &bnd->parent->children);
        if (!bnd->child) {
                if (bnd->parent) {
                        list_add_tail(&btrn->node, &bnd->parent->children);

diff --git a/chunk_queue.c b/chunk_queue.c
index 08f57e9d1ecf9bae1cadead0757fe29418c446c3..cf74cc336de25caa593b198bcfd79a3166996381 100644 (file)
--- a/chunk_queue.c
+++ b/chunk_queue.c
@@ -131,7 +131,7 @@ int cq_get(struct queued_chunk *qc, const char **buf, size_t *num_bytes)
 struct chunk_queue *cq_new(size_t max_pending)
 {
        struct chunk_queue *cq = para_malloc(sizeof(*cq));
 struct chunk_queue *cq_new(size_t max_pending)
 {
        struct chunk_queue *cq = para_malloc(sizeof(*cq));

-       INIT_LIST_HEAD(&cq->q);
+       init_list_head(&cq->q);

        cq->max_pending = max_pending;
        cq->num_pending = 0;
        return cq;
        cq->max_pending = max_pending;
        cq->num_pending = 0;
        return cq;

diff --git a/close_on_fork.c b/close_on_fork.c
index 28c5eabb1ae9a4821b60b638be559e837dc54f36..7b464d09cab0ed446aac327fbba6d32f9aadd7b3 100644 (file)
--- a/close_on_fork.c
+++ b/close_on_fork.c
@@ -34,7 +34,7 @@ void add_close_on_fork_list(int fd)
        struct close_on_fork *cof = para_malloc(sizeof(struct close_on_fork));
 
        if (!initialized) {
        struct close_on_fork *cof = para_malloc(sizeof(struct close_on_fork));
 
        if (!initialized) {

-               INIT_LIST_HEAD(&close_on_fork_list);
+               init_list_head(&close_on_fork_list);

                initialized = 1;
        }
        cof->fd = fd;
                initialized = 1;
        }
        cof->fd = fd;

diff --git a/list.h b/list.h
index ddcb69da1e00c4f9b82fc5b35d190b932a0e0709..78c302fa322fe6bc2dae2926e95e58189c10c944 100644 (file)
--- a/list.h
+++ b/list.h
@@ -25,9 +25,11 @@ struct list_head {
 #define INITIALIZED_LIST_HEAD(name) struct list_head name = {&(name), &(name)}
 
 /** This must be called before using any other list functions. */
 #define INITIALIZED_LIST_HEAD(name) struct list_head name = {&(name), &(name)}
 
 /** This must be called before using any other list functions. */

-#define INIT_LIST_HEAD(ptr) do { \
-       (ptr)->next = (ptr); (ptr)->prev = (ptr); \
-} while (0)
+static inline void init_list_head(struct list_head *head)
+{
+       head->next = head;
+       head->prev = head;
+}

 
 /**
  * Insert a new entry after the specified head.
 
 /**
  * Insert a new entry after the specified head.

diff --git a/mood.c b/mood.c
index a63d4d2af5d10d7b64c319d915e00b9b7ea62e89..d76cbaf362cccbc305c9f26543440bfb8ffbe590 100644 (file)
--- a/mood.c
+++ b/mood.c
@@ -263,9 +263,9 @@ static struct mood *alloc_new_mood(const char *name)
        struct mood *m = para_calloc(sizeof(struct mood));
        if (name)
                m->name = para_strdup(name);
        struct mood *m = para_calloc(sizeof(struct mood));
        if (name)
                m->name = para_strdup(name);

-       INIT_LIST_HEAD(&m->accept_list);
-       INIT_LIST_HEAD(&m->deny_list);
-       INIT_LIST_HEAD(&m->score_list);
+       init_list_head(&m->accept_list);
+       init_list_head(&m->deny_list);
+       init_list_head(&m->score_list);

        return m;
 }
 
        return m;
 }
 

diff --git a/net.c b/net.c
index 91200fc040bcfebafccf9e737fb65514af9ff8f2..e1951e5e8d87501b1ef9096d3f3df64117e904f0 100644 (file)
--- a/net.c
+++ b/net.c
@@ -288,7 +288,7 @@ struct flowopts *flowopt_new(void)
 {
        struct flowopts *new = para_malloc(sizeof(*new));
 
 {
        struct flowopts *new = para_malloc(sizeof(*new));
 

-       INIT_LIST_HEAD(&new->sockopts);
+       init_list_head(&new->sockopts);

        return new;
 }
 
        return new;
 }
 

diff --git a/sched.c b/sched.c
index a2903940fdaea1b24d6a49cfc2f54766c136070f..aac8efed1bcf8d897e6aef4d07973f2babc8d4f4 100644 (file)
--- a/sched.c
+++ b/sched.c
@@ -244,7 +244,7 @@ struct task *task_register(struct task_info *info, struct sched *s)
        assert(info->post_select);
 
        if (!s->task_list.next)
        assert(info->post_select);
 
        if (!s->task_list.next)

-               INIT_LIST_HEAD(&s->task_list);
+               init_list_head(&s->task_list);

 
        t->info = *info;
        t->name = para_strdup(info->name);
 
        t->info = *info;
        t->name = para_strdup(info->name);

diff --git a/send_common.c b/send_common.c
index ea494d9a7b23f5ee87186917d11e883631ec9cbc..9debdfca5a40a7ada404e9cf4a034140e2509a6b 100644 (file)
--- a/send_common.c
+++ b/send_common.c
@@ -136,9 +136,9 @@ void init_sender_status(struct sender_status *ss,
        }
        ss->default_port = default_port;
 
        }
        ss->default_port = default_port;
 

-       INIT_LIST_HEAD(&ss->client_list);
+       init_list_head(&ss->client_list);

        /* Initialize an access control list */
        /* Initialize an access control list */

-       INIT_LIST_HEAD(&ss->acl);
+       init_list_head(&ss->acl);

        for (i = 0; i < lls_opt_given(acl_opt_result); i++) {
                const char *arg = lls_string_val(i, acl_opt_result);
                char addr[16];
        for (i = 0; i < lls_opt_given(acl_opt_result); i++) {
                const char *arg = lls_string_val(i, acl_opt_result);
                char addr[16];

diff --git a/sync_filter.c b/sync_filter.c
index 2ca2a657de6a79cb9b9e9ee3be47789e11f48e05..13bbcf1b9b7bfa18ab4c7606f5ff5cc4f5863503 100644 (file)
--- a/sync_filter.c
+++ b/sync_filter.c
@@ -103,7 +103,7 @@ static void sync_open(struct filter_node *fn)
        const struct lls_opt_result *r_b;
 
        ctx = fn->private_data = para_calloc(sizeof(*ctx));
        const struct lls_opt_result *r_b;
 
        ctx = fn->private_data = para_calloc(sizeof(*ctx));

-       INIT_LIST_HEAD(&ctx->buddies);
+       init_list_head(&ctx->buddies);

 
        /* create socket to listen for incoming packets */
        ret = makesock(
 
        /* create socket to listen for incoming packets */
        ret = makesock(

diff --git a/udp_send.c b/udp_send.c
index 04e2982f86bf125c5b4ce8ab2d6daa9280ea0bce..be161a86c166f26779e015720612a452925704c6 100644 (file)
--- a/udp_send.c
+++ b/udp_send.c
@@ -392,7 +392,7 @@ static void udp_init_target_list(void)
        struct sender_command_data scd;
        int i;
 
        struct sender_command_data scd;
        int i;
 

-       INIT_LIST_HEAD(&targets);
+       init_list_head(&targets);

        for (i = 0; i < OPT_GIVEN(UDP_TARGET); i++) {
                const char *arg = lls_string_val(i, OPT_RESULT(UDP_TARGET));
                if (udp_resolve_target(arg, &scd) < 0)
        for (i = 0; i < OPT_GIVEN(UDP_TARGET); i++) {
                const char *arg = lls_string_val(i, OPT_RESULT(UDP_TARGET));
                if (udp_resolve_target(arg, &scd) < 0)


@@ -425,7 +425,7 @@ static char *udp_help(void)
 /* Initialize the list of udp targets. */
 static void udp_send_init(void)
 {
 /* Initialize the list of udp targets. */
 static void udp_send_init(void)
 {

-       INIT_LIST_HEAD(&targets);
+       init_list_head(&targets);

        sender_status = SENDER_off;
        udp_init_target_list();
        if (!OPT_GIVEN(UDP_NO_AUTOSTART))
        sender_status = SENDER_off;
        udp_init_target_list();
        if (!OPT_GIVEN(UDP_NO_AUTOSTART))

diff --git a/vss.c b/vss.c
index 9857d92dcd7e0e32721aaca15a86fc27fc061292..ad5f7ec0db6886894a90f32b4c5adf444871ddf0 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -1170,7 +1170,7 @@ void vss_init(int afs_socket, struct sched *s)
        vsst->afs_socket = afs_socket;
        ms2tv(announce_time, &vsst->announce_tv);
        PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&vsst->announce_tv));
        vsst->afs_socket = afs_socket;
        ms2tv(announce_time, &vsst->announce_tv);
        PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&vsst->announce_tv));

-       INIT_LIST_HEAD(&fec_client_list);
+       init_list_head(&fec_client_list);

        FOR_EACH_SENDER(i) {
                PARA_NOTICE_LOG("initializing %s sender\n", senders[i]->name);
                senders[i]->init();
        FOR_EACH_SENDER(i) {
                PARA_NOTICE_LOG("initializing %s sender\n", senders[i]->name);
                senders[i]->init();