ipcpd: normal: Use new list API

After a previous commit the API of the linked list was changed. This
updates the files that were not yet merged upstream.

2 files changed, 6 insertions, 6 deletions

diff --git a/src/ipcpd/normal/fmgr.c b/src/ipcpd/normal/fmgr.c
index d839cf1b..33ac83c9 100644
--- a/src/ipcpd/normal/fmgr.c
+++ b/src/ipcpd/normal/fmgr.c
@@ -227,7 +227,7 @@ static void * fmgr_nm1_flow_wait(void * o)
         while (true) {
                 if (gam_flow_wait(fmgr.gam, &fd, &info, &qs)) {
                         LOG_ERR("Failed to get next flow descriptor.");
-                        continue;;
+                        continue;
                 }
 
                 ipcp_flow_get_qoscube(fd, &cube);
@@ -248,7 +248,7 @@ static void * fmgr_nm1_flow_wait(void * o)
                 flow->fd = fd;
                 flow->qs = qs;
 
-                INIT_LIST_HEAD(&flow->next);
+                list_head_init(&flow->next);
                 list_add(&flow->next, &fmgr.nm1_flows);
 
                 pthread_rwlock_unlock(&fmgr.nm1_flows_lock);
@@ -312,7 +312,7 @@ int fmgr_init()
                 return -1;
         }
 
-        INIT_LIST_HEAD(&fmgr.nm1_flows);
+        list_head_init(&fmgr.nm1_flows);
 
         pthread_rwlock_init(&fmgr.nm1_flows_lock, NULL);
         pthread_rwlock_init(&fmgr.np1_flows_lock, NULL);
diff --git a/src/ipcpd/normal/gam.c b/src/ipcpd/normal/gam.c
index a749563d..34db87e3 100644
--- a/src/ipcpd/normal/gam.c
+++ b/src/ipcpd/normal/gam.c
@@ -104,7 +104,7 @@ struct gam * gam_create(char * ae_name)
         if (tmp == NULL)
                 return NULL;
 
-        INIT_LIST_HEAD(&tmp->gas);
+        list_head_init(&tmp->gas);
 
         tmp->ae_name = strdup(ae_name);
         if (tmp->ae_name == NULL) {
@@ -215,7 +215,7 @@ static int add_ga(struct gam *        instance,
         ga->info = info;
         ga->qs = qs;
 
-        INIT_LIST_HEAD(&ga->next);
+        list_head_init(&ga->next);
 
         pthread_mutex_lock(&instance->gas_lock);
         list_add(&ga->next, &instance->gas);
@@ -316,7 +316,7 @@ int gam_flow_wait(struct gam *         instance,
 
         pthread_mutex_lock(&instance->gas_lock);
 
-        while (list_empty(&instance->gas))
+        while (list_is_empty(&instance->gas))
                 pthread_cond_wait(&instance->gas_cond, &instance->gas_lock);
 
         ga = list_first_entry((&instance->gas), struct ga, next);