summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2016-03-14 14:37:31 +0100
committerSander Vrijders <sander.vrijders@intec.ugent.be>2016-03-14 14:37:31 +0100
commit74dc5818ac8586fcc36915874592c9f4fbb4e6f6 (patch)
treeb743f3d323e6cc720a809f1aa5d16f2c3ea8cf3b
parent83f7ac29e70595d0bd68645e0aa91b2b34a286db (diff)
parent56a31976b04dd5514c9ce054ad355a59d84ae28f (diff)
downloadouroboros-74dc5818ac8586fcc36915874592c9f4fbb4e6f6.tar.gz
ouroboros-74dc5818ac8586fcc36915874592c9f4fbb4e6f6.zip
Merged in dstaesse/ouroboros/be-clang (pull request #30)
Fixed clang compilation errors
-rw-r--r--src/lib/du_buff.c2
-rw-r--r--src/tools/irm/irm_bootstrap_ipcp.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/du_buff.c b/src/lib/du_buff.c
index bd1a092d..cf523847 100644
--- a/src/lib/du_buff.c
+++ b/src/lib/du_buff.c
@@ -311,7 +311,7 @@ uint8_t * du_buff_head_alloc(du_buff_t * dub, size_t size)
return NULL;
}
- if (dub->du_head - size < 0) {
+ if ((long) (dub->du_head - size) < 0) {
LOG_WARN("Failed to allocate PCI headspace.");
return NULL;
}
diff --git a/src/tools/irm/irm_bootstrap_ipcp.c b/src/tools/irm/irm_bootstrap_ipcp.c
index e17ed5ef..8c64ba8f 100644
--- a/src/tools/irm/irm_bootstrap_ipcp.c
+++ b/src/tools/irm/irm_bootstrap_ipcp.c
@@ -43,6 +43,8 @@ int do_bootstrap_ipcp(int argc, char ** argv)
rina_name_t name;
struct dif_config conf;
+ conf.qosspecs = NULL;
+
name.ap_name = NULL;
name.api_id = 0;
name.ae_name = "";