diff options
| author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2017-02-08 17:39:07 +0000 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2017-02-08 17:39:07 +0000 |
| commit | 7403be0eadcc772cd3a44615f34bff0ce7009f86 (patch) | |
| tree | fe53f0f33bf81d69bb5c79968ba6761f7da6d161 | |
| parent | 6ade491f770904d8244863904359c449b5aeb5f7 (diff) | |
| parent | 66d495656348ae04b5ab725e0b44dad5f45e1a9b (diff) | |
| download | ouroboros-7403be0eadcc772cd3a44615f34bff0ce7009f86.tar.gz ouroboros-7403be0eadcc772cd3a44615f34bff0ce7009f86.zip | |
Merged in sandervrijders/ouroboros/be-pedantic-sometimes (pull request #365)
lib, ipcpd: Comply to pedantic C99
| -rw-r--r-- | include/ouroboros/irm_config.h | 50 | ||||
| -rw-r--r-- | src/lib/btree.c | 5 |
2 files changed, 26 insertions, 29 deletions
diff --git a/include/ouroboros/irm_config.h b/include/ouroboros/irm_config.h index 2be4273e..3cc59e20 100644 --- a/include/ouroboros/irm_config.h +++ b/include/ouroboros/irm_config.h @@ -55,34 +55,28 @@ struct dif_config { char * dif_name; enum ipcp_type type; - union { - /* Normal DIF */ - struct { - uint8_t addr_size; - uint8_t cep_id_size; - uint8_t pdu_length_size; - uint8_t seqno_size; - - bool has_ttl; - bool has_chk; - - uint32_t min_pdu_size; - uint32_t max_pdu_size; - - enum pol_addr_auth addr_auth_type; - enum pol_gam dt_gam_type; - enum pol_gam rm_gam_type; - }; - /* Shim UDP */ - struct { - uint32_t ip_addr; - uint32_t dns_addr; - }; - /* Shim Ethernet LLC */ - struct { - char * if_name; - }; - }; + /* Normal DIF */ + uint8_t addr_size; + uint8_t cep_id_size; + uint8_t pdu_length_size; + uint8_t seqno_size; + + bool has_ttl; + bool has_chk; + + uint32_t min_pdu_size; + uint32_t max_pdu_size; + + enum pol_addr_auth addr_auth_type; + enum pol_gam dt_gam_type; + enum pol_gam rm_gam_type; + + /* Shim UDP */ + uint32_t ip_addr; + uint32_t dns_addr; + + /* Shim Ethernet LLC */ + char * if_name; }; #endif /* OUROBOROS_IRM_CONFIG_H */ diff --git a/src/lib/btree.c b/src/lib/btree.c index 645e7c7a..38302dae 100644 --- a/src/lib/btree.c +++ b/src/lib/btree.c @@ -388,9 +388,12 @@ int btree_insert(struct btree * tree, void * val) { struct btnode * rgt = NULL; - struct key_val kv = {key, val}; + struct key_val kv; struct key_val med; + kv.key = key; + kv.val = val; + if (tree == NULL || val == NULL) return -EINVAL; |