diff options
| author | Garrett D'Amore <garrett@damore.org> | 2016-12-31 00:20:08 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2016-12-31 00:20:08 -0800 |
| commit | ee060d0de215c481e0f431c6bfe6172c15fea288 (patch) | |
| tree | d28797ff78fbdf827f5de22e23d9689aac424c8e /src | |
| parent | 64f4efa81a4bddcd8bdc31b6408b67d6c2e27dd1 (diff) | |
| download | nng-ee060d0de215c481e0f431c6bfe6172c15fea288.tar.gz nng-ee060d0de215c481e0f431c6bfe6172c15fea288.tar.bz2 nng-ee060d0de215c481e0f431c6bfe6172c15fea288.zip | |
Uncrustify fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/pipe.h | 4 | ||||
| -rw-r--r-- | src/core/protocol.h | 4 | ||||
| -rw-r--r-- | src/protocol/reqrep/rep.c | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/core/pipe.h b/src/core/pipe.h index 2b4feb7d..d12320b2 100644 --- a/src/core/pipe.h +++ b/src/core/pipe.h @@ -20,8 +20,8 @@ struct nng_pipe { uint32_t p_id; struct nni_pipe_ops p_ops; void * p_trandata; - void * p_pdata; // protocol specific data - size_t p_psize; // size of protocol data + void * p_pdata; // protocol specific data + size_t p_psize; // size of protocol data nni_list_node p_node; nni_socket * p_sock; nni_endpt * p_ep; diff --git a/src/core/protocol.h b/src/core/protocol.h index a8e93ea7..3a391ece 100644 --- a/src/core/protocol.h +++ b/src/core/protocol.h @@ -39,11 +39,11 @@ struct nni_protocol { // Thread functions for processing send & receive sides of // protocol pipes. Send may be NULL, but recv should should not. // (Recv needs to detect a closed pipe, if nothing else.) - void (*proto_pipe_send)(void *); + void (*proto_pipe_send)(void *); void (*proto_pipe_recv)(void *); // Option manipulation. These may be NULL. - int (*proto_setopt)(void *, int, const void *, size_t); + int (*proto_setopt)(void *, int, const void *, size_t); int (*proto_getopt)(void *, int, void *, size_t *); // Receive filter. This may be NULL, but if it isn't, then diff --git a/src/protocol/reqrep/rep.c b/src/protocol/reqrep/rep.c index 1b48ca08..ddfcc0c7 100644 --- a/src/protocol/reqrep/rep.c +++ b/src/protocol/reqrep/rep.c @@ -138,6 +138,7 @@ nni_rep_rem_pipe(void *arg, void *data) nni_msgqueue_destroy(rp->sendq); } + // nni_rep_topsender watches for messages from the upper write queue, // extracts the destination pipe, and forwards it to the appropriate // destination pipe via a separate queue. This prevents a single bad @@ -176,7 +177,7 @@ nni_rep_topsender(void *arg) nni_msg_trim_header(msg, 4); nni_mutex_enter(&rep->mx); - if (nni_idhash_find(rep->pipes, id, (void **)&rp) != 0) { + if (nni_idhash_find(rep->pipes, id, (void **) &rp) != 0) { nni_mutex_exit(&rep->mx); nni_msg_free(msg); continue; @@ -193,6 +194,7 @@ nni_rep_topsender(void *arg) } } + static void nni_rep_sender(void *arg) { @@ -344,7 +346,6 @@ nni_rep_getopt(void *arg, int opt, void *buf, size_t *szp) } - static nni_msg * nni_rep_sendfilter(void *arg, nni_msg *msg) { |