From 101c1b6a946d9f2f48c6dd89940ae669141e0511 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Thu, 22 Dec 2016 01:57:10 -0800 Subject: Use C99 structure initializers FTW. Various other changes. --- src/core/socket.h | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'src/core/socket.h') 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 - * - * 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 +// +// 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 -- cgit v1.2.3-70-g09d2