summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordimitri staessens <[email protected]>2016-09-02 11:12:53 +0200
committerdimitri staessens <[email protected]>2016-09-02 11:12:53 +0200
commit0325130c969c32f8802122f609c0dd225e5c1a1f (patch)
treea97accc000af65951fd275ce409bd72fbc9ce5a9 /src
parentfe197a226c0a7755f19a2956294ba435701a42ea (diff)
parent9f4b673a03b66a53e3b044b26d0669d2e800cf50 (diff)
downloadouroboros-0325130c969c32f8802122f609c0dd225e5c1a1f.tar.gz
ouroboros-0325130c969c32f8802122f609c0dd225e5c1a1f.zip
Merged in sandervrijders/ouroboros/be-alloc-flow (pull request #235)
lib: Change rdrbuff API to use correct types
Diffstat (limited to 'src')
-rw-r--r--src/ipcpd/local/main.c2
-rw-r--r--src/lib/shm_rdrbuff.c16
2 files changed, 9 insertions, 9 deletions
diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c
index 4fa7e33f..f1b6dd9e 100644
--- a/src/ipcpd/local/main.c
+++ b/src/ipcpd/local/main.c
@@ -393,7 +393,7 @@ static int ipcp_local_flow_alloc_resp(pid_t n_api,
int response)
{
struct shm_ap_rbuff * rb;
- int in_fd = -1;\
+ int in_fd = -1;
int out_fd = -1;
int ret = -1;
diff --git a/src/lib/shm_rdrbuff.c b/src/lib/shm_rdrbuff.c
index 96f54bd5..93a889ce 100644
--- a/src/lib/shm_rdrbuff.c
+++ b/src/lib/shm_rdrbuff.c
@@ -691,8 +691,8 @@ int shm_rdrbuff_remove(struct shm_rdrbuff * rdrb, ssize_t idx)
}
uint8_t * shm_du_buff_head_alloc(struct shm_rdrbuff * rdrb,
- int idx,
- ssize_t size)
+ ssize_t idx,
+ size_t size)
{
struct shm_du_buff * sdb;
uint8_t * buf;
@@ -729,8 +729,8 @@ uint8_t * shm_du_buff_head_alloc(struct shm_rdrbuff * rdrb,
}
uint8_t * shm_du_buff_tail_alloc(struct shm_rdrbuff * rdrb,
- int idx,
- ssize_t size)
+ ssize_t idx,
+ size_t size)
{
struct shm_du_buff * sdb;
uint8_t * buf;
@@ -767,8 +767,8 @@ uint8_t * shm_du_buff_tail_alloc(struct shm_rdrbuff * rdrb,
}
int shm_du_buff_head_release(struct shm_rdrbuff * rdrb,
- int idx,
- ssize_t size)
+ ssize_t idx,
+ size_t size)
{
struct shm_du_buff * sdb;
@@ -803,8 +803,8 @@ int shm_du_buff_head_release(struct shm_rdrbuff * rdrb,
}
int shm_du_buff_tail_release(struct shm_rdrbuff * rdrb,
- int idx,
- ssize_t size)
+ ssize_t idx,
+ size_t size)
{
struct shm_du_buff * sdb;