From a6f05acb1b80234b64ec55ab9284dc381617e9f5 Mon Sep 17 00:00:00 2001 From: Slava Barinov Date: Tue, 2 May 2017 14:02:19 +0300 Subject: [PATCH] Move variable declarations from header to source This makes build with -fno-common possible and allows ASan enabling. Change-Id: If8aae6e82f692837bcb816cbeae39608ba99975a Signed-off-by: Slava Barinov --- src/rpc_com.h | 4 ++-- src/svc.c | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/rpc_com.h b/src/rpc_com.h index 38c2cfe..f50a409 100644 --- a/src/rpc_com.h +++ b/src/rpc_com.h @@ -87,8 +87,8 @@ void __xprt_unregister_unlocked(SVCXPRT *); void __xprt_set_raddr(SVCXPRT *, const struct sockaddr_storage *); -SVCXPRT **__svc_xports; -int __svc_maxrec; +extern SVCXPRT **__svc_xports; +extern int __svc_maxrec; __END_DECLS diff --git a/src/svc.c b/src/svc.c index 8afd15d..30f8930 100644 --- a/src/svc.c +++ b/src/svc.c @@ -60,6 +60,9 @@ #define max(a, b) (a > b ? a : b) +SVCXPRT **__svc_xports; +int __svc_maxrec; + /* * The services list * Each entry represents a set of procedures (an rpc program). @@ -705,7 +708,7 @@ svc_getreq_common (fd) * If so, then break. */ rwlock_rdlock (&svc_fd_lock); - + if (xprt != __svc_xports[fd]) { rwlock_unlock (&svc_fd_lock); -- 2.7.4