diff options
| author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-09-02 11:12:53 +0200 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-09-02 11:12:53 +0200 |
| commit | 0325130c969c32f8802122f609c0dd225e5c1a1f (patch) | |
| tree | a97accc000af65951fd275ce409bd72fbc9ce5a9 | |
| parent | fe197a226c0a7755f19a2956294ba435701a42ea (diff) | |
| parent | 9f4b673a03b66a53e3b044b26d0669d2e800cf50 (diff) | |
| download | ouroboros-0325130c969c32f8802122f609c0dd225e5c1a1f.tar.gz ouroboros-0325130c969c32f8802122f609c0dd225e5c1a1f.zip | |
Merged in sandervrijders/ouroboros/be-alloc-flow (pull request #235)
lib: Change rdrbuff API to use correct types
| -rw-r--r-- | include/ouroboros/shm_rdrbuff.h | 16 | ||||
| -rw-r--r-- | src/ipcpd/local/main.c | 2 | ||||
| -rw-r--r-- | src/lib/shm_rdrbuff.c | 16 |
3 files changed, 17 insertions, 17 deletions
diff --git a/include/ouroboros/shm_rdrbuff.h b/include/ouroboros/shm_rdrbuff.h index 09256c56..6cdaa7bf 100644 --- a/include/ouroboros/shm_rdrbuff.h +++ b/include/ouroboros/shm_rdrbuff.h @@ -67,18 +67,18 @@ int shm_rdrbuff_remove(struct shm_rdrbuff * rdrb, uint8_t * shm_du_buff_head_alloc(struct shm_rdrbuff * rdrb, - int idx, - ssize_t size); + ssize_t idx, + size_t size); uint8_t * shm_du_buff_tail_alloc(struct shm_rdrbuff * rdrb, - int idx, - ssize_t size); + ssize_t idx, + size_t size); int shm_du_buff_head_release(struct shm_rdrbuff * rdrb, - int idx, - ssize_t size); + ssize_t idx, + size_t size); int shm_du_buff_tail_release(struct shm_rdrbuff * rdrb, - int idx, - ssize_t size); + ssize_t idx, + size_t size); #endif /* OUROBOROS_SHM_RDRBUFF_H */ 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; |