From 20ef211cfa5b5fcc437484a879fdc5d4c66bbaf5 Mon Sep 17 00:00:00 2001 From: ShyamsundarR Date: Thu, 29 Nov 2018 14:08:06 -0500 Subject: libglusterfs: Move devel headers under glusterfs directory libglusterfs devel package headers are referenced in code using include semantics for a program, this while it works can be better especially when dealing with out of tree xlator builds or in general out of tree devel package usage. Towards this, the following changes are done, - moved all devel headers under a glusterfs directory - Included these headers using system header notation <> in all code outside of libglusterfs - Included these headers using own program notation "" within libglusterfs This change although big, is just moving around the headers and making it correct when including these headers from other sources. This helps us correctly include libglusterfs includes without namespace conflicts. Change-Id: Id2a98854e671a7ee5d73be44da5ba1a74252423b Updates: bz#1193929 Signed-off-by: ShyamsundarR --- rpc/rpc-transport/rdma/src/name.c | 2 +- rpc/rpc-transport/rdma/src/name.h | 2 +- rpc/rpc-transport/rdma/src/rdma.c | 12 ++++++------ rpc/rpc-transport/rdma/src/rdma.h | 6 +++--- rpc/rpc-transport/rdma/src/rpc-trans-rdma-messages.h | 2 +- rpc/rpc-transport/socket/src/name.c | 2 +- rpc/rpc-transport/socket/src/name.h | 2 +- rpc/rpc-transport/socket/src/socket-mem-types.h | 2 +- rpc/rpc-transport/socket/src/socket.c | 16 ++++++++-------- rpc/rpc-transport/socket/src/socket.h | 12 ++++++------ 10 files changed, 29 insertions(+), 29 deletions(-) (limited to 'rpc/rpc-transport') diff --git a/rpc/rpc-transport/rdma/src/name.c b/rpc/rpc-transport/rdma/src/name.c index d57f2d4f58d..47184d9f148 100644 --- a/rpc/rpc-transport/rdma/src/name.c +++ b/rpc/rpc-transport/rdma/src/name.c @@ -21,7 +21,7 @@ #include "rpc-transport.h" #include "rdma.h" -#include "common-utils.h" +#include #include "rpc-lib-messages.h" #include "rpc-trans-rdma-messages.h" diff --git a/rpc/rpc-transport/rdma/src/name.h b/rpc/rpc-transport/rdma/src/name.h index 6c782b52db5..41c4c6a7e8e 100644 --- a/rpc/rpc-transport/rdma/src/name.h +++ b/rpc/rpc-transport/rdma/src/name.h @@ -13,7 +13,7 @@ #include -#include "compat.h" +#include int32_t gf_rdma_client_bind(rpc_transport_t *this, struct sockaddr *sockaddr, diff --git a/rpc/rpc-transport/rdma/src/rdma.c b/rpc/rpc-transport/rdma/src/rdma.c index ebf54885f1a..45605c8ff53 100644 --- a/rpc/rpc-transport/rdma/src/rdma.c +++ b/rpc/rpc-transport/rdma/src/rdma.c @@ -8,14 +8,14 @@ cases as published by the Free Software Foundation. */ -#include "dict.h" -#include "glusterfs.h" -#include "iobuf.h" -#include "logging.h" +#include +#include +#include +#include #include "rdma.h" #include "name.h" -#include "byte-order.h" -#include "xlator.h" +#include +#include #include "xdr-rpc.h" #include "rpc-lib-messages.h" #include "rpc-trans-rdma-messages.h" diff --git a/rpc/rpc-transport/rdma/src/rdma.h b/rpc/rpc-transport/rdma/src/rdma.h index 84c1397054b..403f5678ad8 100644 --- a/rpc/rpc-transport/rdma/src/rdma.h +++ b/rpc/rpc-transport/rdma/src/rdma.h @@ -17,10 +17,10 @@ #include "rpc-clnt.h" #include "rpc-transport.h" -#include "xlator.h" -#include "gf-event.h" +#include +#include #include -#include +#include #include #include #include diff --git a/rpc/rpc-transport/rdma/src/rpc-trans-rdma-messages.h b/rpc/rpc-transport/rdma/src/rpc-trans-rdma-messages.h index 6e9ea9a2925..662a8980648 100644 --- a/rpc/rpc-transport/rdma/src/rpc-trans-rdma-messages.h +++ b/rpc/rpc-transport/rdma/src/rpc-trans-rdma-messages.h @@ -11,7 +11,7 @@ #ifndef _RPC_TRANS_RDMA_MESSAGES_H_ #define _RPC_TRANS_RDMA_MESSAGES_H_ -#include "glfs-message-id.h" +#include /* To add new message IDs, append new identifiers at the end of the list. * diff --git a/rpc/rpc-transport/socket/src/name.c b/rpc/rpc-transport/socket/src/name.c index 1f866ccdecf..ca14402ed4a 100644 --- a/rpc/rpc-transport/socket/src/name.c +++ b/rpc/rpc-transport/socket/src/name.c @@ -21,7 +21,7 @@ #include "rpc-transport.h" #include "socket.h" -#include "common-utils.h" +#include static void _assign_port(struct sockaddr *sockaddr, uint16_t port) diff --git a/rpc/rpc-transport/socket/src/name.h b/rpc/rpc-transport/socket/src/name.h index 85f8bb7040b..080c7588f5a 100644 --- a/rpc/rpc-transport/socket/src/name.h +++ b/rpc/rpc-transport/socket/src/name.h @@ -11,7 +11,7 @@ #ifndef _SOCKET_NAME_H #define _SOCKET_NAME_H -#include "compat.h" +#include int32_t client_bind(rpc_transport_t *this, struct sockaddr *sockaddr, diff --git a/rpc/rpc-transport/socket/src/socket-mem-types.h b/rpc/rpc-transport/socket/src/socket-mem-types.h index edf3ed0c6f1..241ce67f670 100644 --- a/rpc/rpc-transport/socket/src/socket-mem-types.h +++ b/rpc/rpc-transport/socket/src/socket-mem-types.h @@ -11,7 +11,7 @@ #ifndef __SOCKET_MEM_TYPES_H__ #define __SOCKET_MEM_TYPES_H__ -#include "mem-types.h" +#include typedef enum gf_sock_mem_types_ { gf_sock_connect_error_state_t = gf_common_mt_end + 1, diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index 776e647d4f6..38e52081b3c 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -10,16 +10,16 @@ #include "socket.h" #include "name.h" -#include "dict.h" +#include #include "rpc-transport.h" -#include "logging.h" -#include "xlator.h" -#include "syscall.h" -#include "byte-order.h" -#include "common-utils.h" -#include "compat-errno.h" +#include +#include +#include +#include +#include +#include #include "socket-mem-types.h" -#include "timer.h" +#include /* ugly #includes below */ #include "protocol-common.h" diff --git a/rpc/rpc-transport/socket/src/socket.h b/rpc/rpc-transport/socket/src/socket.h index f1bfba45076..9cbb2a89a22 100644 --- a/rpc/rpc-transport/socket/src/socket.h +++ b/rpc/rpc-transport/socket/src/socket.h @@ -21,13 +21,13 @@ #include #endif -#include "gf-event.h" +#include #include "rpc-transport.h" -#include "logging.h" -#include "dict.h" -#include "mem-pool.h" -#include "globals.h" -#include "refcount.h" +#include +#include +#include +#include +#include #ifndef MAX_IOVEC #define MAX_IOVEC 16 -- cgit