diff options
Diffstat (limited to 'src/irmd')
| -rw-r--r-- | src/irmd/api_table.c | 4 | ||||
| -rw-r--r-- | src/irmd/apn_table.c | 4 | ||||
| -rw-r--r-- | src/irmd/main.c | 18 | ||||
| -rw-r--r-- | src/irmd/registry.c | 18 |
4 files changed, 22 insertions, 22 deletions
diff --git a/src/irmd/api_table.c b/src/irmd/api_table.c index 97b8eb0f..4b9d9ecb 100644 --- a/src/irmd/api_table.c +++ b/src/irmd/api_table.c @@ -42,8 +42,8 @@ struct api_entry * api_entry_create(pid_t api, char * apn) if (e == NULL) return NULL; - INIT_LIST_HEAD(&e->next); - INIT_LIST_HEAD(&e->names); + list_head_init(&e->next); + list_head_init(&e->names); e->api = api; e->apn = apn; diff --git a/src/irmd/apn_table.c b/src/irmd/apn_table.c index 34983f78..7edba361 100644 --- a/src/irmd/apn_table.c +++ b/src/irmd/apn_table.c @@ -41,8 +41,8 @@ struct apn_entry * apn_entry_create(char * apn, if (e == NULL) return NULL; - INIT_LIST_HEAD(&e->next); - INIT_LIST_HEAD(&e->names); + list_head_init(&e->next); + list_head_init(&e->names); e->apn = apn; e->ap = ap; diff --git a/src/irmd/main.c b/src/irmd/main.c index b7292e74..295e3320 100644 --- a/src/irmd/main.c +++ b/src/irmd/main.c @@ -150,7 +150,7 @@ static struct ipcp_entry * ipcp_entry_create(void) e->name = NULL; e->dif_name = NULL; - INIT_LIST_HEAD(&e->next); + list_head_init(&e->next); return e; } @@ -260,7 +260,7 @@ static pid_t create_ipcp(char * name, enum ipcp_type ipcp_type) return -1; } - INIT_LIST_HEAD(&tmp->next); + list_head_init(&tmp->next); tmp->api = api->pid; tmp->name = strdup(name); @@ -743,7 +743,7 @@ static int name_reg(char * name, char ** difs, size_t len) pthread_rwlock_wrlock(&irmd->reg_lock); - if (list_empty(&irmd->ipcps)) { + if (list_is_empty(&irmd->ipcps)) { pthread_rwlock_unlock(&irmd->reg_lock); pthread_rwlock_unlock(&irmd->state_lock); return -1; @@ -1988,12 +1988,12 @@ static int irm_create(void) return -1; } - INIT_LIST_HEAD(&irmd->ipcps); - INIT_LIST_HEAD(&irmd->api_table); - INIT_LIST_HEAD(&irmd->apn_table); - INIT_LIST_HEAD(&irmd->spawned_apis); - INIT_LIST_HEAD(&irmd->registry); - INIT_LIST_HEAD(&irmd->irm_flows); + list_head_init(&irmd->ipcps); + list_head_init(&irmd->api_table); + list_head_init(&irmd->apn_table); + list_head_init(&irmd->spawned_apis); + list_head_init(&irmd->registry); + list_head_init(&irmd->irm_flows); irmd->port_ids = bmp_create(IRMD_MAX_FLOWS, 0); if (irmd->port_ids == NULL) { diff --git a/src/irmd/registry.c b/src/irmd/registry.c index 34d0a921..e1f8419e 100644 --- a/src/irmd/registry.c +++ b/src/irmd/registry.c @@ -63,10 +63,10 @@ static struct reg_entry * reg_entry_init(struct reg_entry * e, if (e == NULL || name == NULL) return NULL; - INIT_LIST_HEAD(&e->next); - INIT_LIST_HEAD(&e->difs); - INIT_LIST_HEAD(&e->reg_apns); - INIT_LIST_HEAD(&e->reg_apis); + list_head_init(&e->next); + list_head_init(&e->difs); + list_head_init(&e->reg_apns); + list_head_init(&e->reg_apis); e->name = name; @@ -228,7 +228,7 @@ void reg_entry_del_apn(struct reg_entry * e, char * apn) } } - if (e->state == REG_NAME_AUTO_ACCEPT && list_empty(&e->reg_apns)) { + if (e->state == REG_NAME_AUTO_ACCEPT && list_is_empty(&e->reg_apns)) { e->state = REG_NAME_IDLE; pthread_cond_broadcast(&e->state_cond); } @@ -237,7 +237,7 @@ void reg_entry_del_apn(struct reg_entry * e, char * apn) char * reg_entry_get_apn(struct reg_entry * e) { - if (!list_empty(&e->reg_apis) || list_empty(&e->reg_apns)) + if (!list_is_empty(&e->reg_apis) || list_is_empty(&e->reg_apns)) return NULL; return list_first_entry(&e->reg_apns, struct str_el, next)->str; @@ -311,8 +311,8 @@ void reg_entry_del_api(struct reg_entry * e, pid_t api) } } - if (list_empty(&e->reg_apis)) { - if (!list_empty(&e->reg_apns)) + if (list_is_empty(&e->reg_apis)) { + if (!list_is_empty(&e->reg_apns)) e->state = REG_NAME_AUTO_ACCEPT; else e->state = REG_NAME_IDLE; @@ -328,7 +328,7 @@ pid_t reg_entry_get_api(struct reg_entry * e) if (e == NULL) return -1; - if (list_empty(&e->reg_apis)) + if (list_is_empty(&e->reg_apis)) return -1; return list_first_entry(&e->reg_apis, struct pid_el, next)->pid; |