diff options
| author | Garrett D'Amore <garrett@damore.org> | 2016-12-22 01:57:10 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2016-12-22 01:57:10 -0800 |
| commit | 101c1b6a946d9f2f48c6dd89940ae669141e0511 (patch) | |
| tree | 4da688859d87526d03d724ab1a729c6846650eae /src/core/socket.h | |
| parent | b92672e20420683e73bfc017956ac6ef2b6b793b (diff) | |
| download | nng-101c1b6a946d9f2f48c6dd89940ae669141e0511.tar.gz nng-101c1b6a946d9f2f48c6dd89940ae669141e0511.tar.bz2 nng-101c1b6a946d9f2f48c6dd89940ae669141e0511.zip | |
Use C99 structure initializers FTW. Various other changes.
Diffstat (limited to 'src/core/socket.h')
| -rw-r--r-- | src/core/socket.h | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/core/socket.h b/src/core/socket.h index 366e9958..55944c92 100644 --- a/src/core/socket.h +++ b/src/core/socket.h @@ -1,11 +1,11 @@ -/* - * Copyright 2016 Garrett D'Amore <garrett@damore.org> - * - * This software is supplied under the terms of the MIT License, a - * copy of which should be located in the distribution where this - * file was obtained (LICENSE.txt). A copy of the license may also be - * found online at https://opensource.org/licenses/MIT. - */ +// +// Copyright 2016 Garrett D'Amore <garrett@damore.org> +// +// This software is supplied under the terms of the MIT License, a +// copy of which should be located in the distribution where this +// file was obtained (LICENSE.txt). A copy of the license may also be +// found online at https://opensource.org/licenses/MIT. +// #ifndef CORE_SOCKET_H #define CORE_SOCKET_H @@ -13,7 +13,6 @@ // NB: This structure is supplied here for use by the CORE. Use of this library // OUSIDE of the core is STRICTLY VERBOTEN. NO DIRECT ACCESS BY PROTOCOLS OR // TRANSPORTS. - struct nng_socket { nni_mutex_t s_mx; nni_cond_t s_cv; @@ -25,7 +24,7 @@ struct nng_socket { void * s_data; // Protocol private - /* XXX: options */ + // XXX: options nni_list_t s_eps; nni_list_t s_pipes; @@ -35,12 +34,12 @@ struct nng_socket { int s_senderr; // Protocol state machine use }; -extern int nni_socket_create(nni_socket_t *, uint16_t); -extern int nni_socket_close(nni_socket_t); -extern int nni_socket_add_pipe(nni_socket_t, nni_pipe_t); -extern void nni_socket_rem_pipe(nni_socket_t, nni_pipe_t); -extern uint16_t nni_socket_proto(nni_socket_t); -extern int nni_socket_setopt(nni_socket_t, int, const void *, size_t); -extern int nni_socket_getopt(nni_socket_t, int, void *, size_t *); +extern int nni_socket_create(nni_socket **, uint16_t); +extern int nni_socket_close(nni_socket *); +extern int nni_socket_add_pipe(nni_socket *, nni_pipe *); +extern void nni_socket_rem_pipe(nni_socket *, nni_pipe *); +extern uint16_t nni_socket_proto(nni_socket *); +extern int nni_socket_setopt(nni_socket *, int, const void *, size_t); +extern int nni_socket_getopt(nni_socket *, int, void *, size_t *); #endif // CORE_SOCKET_H |