VPP-327 Coding standards cleanup for vppinfra

Fix additional a few additional deviations reported elsewhere by
checkstyle

Change-Id: I026a8ae1c5b1856bbe3c4a555e1b690e7501b045
Signed-off-by: Dave Barach <dave@barachs.net>

1 files changed, 51 insertions, 28 deletions

diff --git a/vppinfra/vppinfra/socket.h b/vppinfra/vppinfra/socket.h
index a2d964afed9..08e22e7eb61 100644
--- a/vppinfra/vppinfra/socket.h
+++ b/vppinfra/vppinfra/socket.h
@@ -46,12 +46,13 @@
 #include <vppinfra/error.h>
 #include <vppinfra/format.h>
 
-typedef struct _socket_t {
+typedef struct _socket_t
+{
   /* File descriptor. */
   i32 fd;
 
   /* Config string for socket HOST:PORT or just HOST. */
-  char * config;
+  char *config;
 
   u32 flags;
 #define SOCKET_IS_SERVER (1 << 0)
@@ -62,59 +63,74 @@ typedef struct _socket_t {
 #define SOCKET_RX_END_OF_FILE (1 << 2)
 
   /* Transmit buffer.  Holds data waiting to be written. */
-  u8 * tx_buffer;
+  u8 *tx_buffer;
 
   /* Receive buffer.  Holds data read from socket. */
-  u8 * rx_buffer;
+  u8 *rx_buffer;
 
   /* Peer socket we are connected to. */
   struct sockaddr_in peer;
 
-  clib_error_t * (* write_func) (struct _socket_t * sock);
-  clib_error_t * (* read_func) (struct _socket_t * sock, int min_bytes);
-  clib_error_t * (* close_func) (struct _socket_t * sock);
-  void * private_data;
+  clib_error_t *(*write_func) (struct _socket_t * sock);
+  clib_error_t *(*read_func) (struct _socket_t * sock, int min_bytes);
+  clib_error_t *(*close_func) (struct _socket_t * sock);
+  void *private_data;
 } clib_socket_t;
 
 /* socket config format is host:port.
    Unspecified port causes a free one to be chosen starting
    from IPPORT_USERRESERVED (5000). */
-clib_error_t *
-clib_socket_init (clib_socket_t * socket);
+clib_error_t *clib_socket_init (clib_socket_t * socket);
 
-clib_error_t * clib_socket_accept (clib_socket_t * server, clib_socket_t * client);
+clib_error_t *clib_socket_accept (clib_socket_t * server,
+				  clib_socket_t * client);
 
-always_inline uword clib_socket_is_server (clib_socket_t * sock)
-{ return (sock->flags & SOCKET_IS_SERVER) != 0; }
+always_inline uword
+clib_socket_is_server (clib_socket_t * sock)
+{
+  return (sock->flags & SOCKET_IS_SERVER) != 0;
+}
 
-always_inline uword clib_socket_is_client (clib_socket_t * s)
-{ return ! clib_socket_is_server (s); }
+always_inline uword
+clib_socket_is_client (clib_socket_t * s)
+{
+  return !clib_socket_is_server (s);
+}
 
-always_inline int clib_socket_rx_end_of_file (clib_socket_t * s)
-{ return s->flags & SOCKET_RX_END_OF_FILE; }
+always_inline int
+clib_socket_rx_end_of_file (clib_socket_t * s)
+{
+  return s->flags & SOCKET_RX_END_OF_FILE;
+}
 
 always_inline void *
 clib_socket_tx_add (clib_socket_t * s, int n_bytes)
 {
-  u8 * result;
+  u8 *result;
   vec_add2 (s->tx_buffer, result, n_bytes);
   return result;
 }
 
 always_inline void
-clib_socket_tx_add_va_formatted (clib_socket_t * s, char * fmt, va_list * va)
-{ s->tx_buffer = va_format (s->tx_buffer, fmt, va); }
+clib_socket_tx_add_va_formatted (clib_socket_t * s, char *fmt, va_list * va)
+{
+  s->tx_buffer = va_format (s->tx_buffer, fmt, va);
+}
 
 always_inline clib_error_t *
 clib_socket_tx (clib_socket_t * s)
-{ return s->write_func (s); }
+{
+  return s->write_func (s);
+}
 
 always_inline clib_error_t *
 clib_socket_rx (clib_socket_t * s, int n_bytes)
-{ return s->read_func (s, n_bytes); }
+{
+  return s->read_func (s, n_bytes);
+}
 
 always_inline void
-clib_socket_free (clib_socket_t *s)
+clib_socket_free (clib_socket_t * s)
 {
   vec_free (s->tx_buffer);
   vec_free (s->rx_buffer);
@@ -124,14 +140,21 @@ clib_socket_free (clib_socket_t *s)
 }
 
 always_inline clib_error_t *
-clib_socket_close (clib_socket_t *sock)
+clib_socket_close (clib_socket_t * sock)
 {
-  clib_error_t * err;
-  err = (* sock->close_func) (sock);
+  clib_error_t *err;
+  err = (*sock->close_func) (sock);
   return err;
 }
 
-void
-clib_socket_tx_add_formatted (clib_socket_t * s, char * fmt, ...);
+void clib_socket_tx_add_formatted (clib_socket_t * s, char *fmt, ...);
 
 #endif /* _clib_included_socket_h */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */