From: Felix Janda <felix.janda@posteo.de>
To: libtirpc-devel@lists.sourceforge.net, linux-nfs@vger.kernel.org
Subject: [PATCH v2] Deduplicate extern "C" blocks
Date: Sun, 17 Apr 2016 19:43:30 +0200 [thread overview]
Message-ID: <20160417174330.GA637@nyan> (raw)
In-Reply-To: <20160417161813.GG5369@vapier.lan>
Signed-off-by: Felix Janda <felix.janda@posteo.de>
---
v2: Leave start of first block and end of last block as they are
Mike Frysinger wrote:
> it isn't normal to wrap includes in extern C. header files should only
> be wrapping their own local content.
> -mike
Ok, thanks.
---
tirpc/rpc/auth.h | 48 ------------------------------------------------
tirpc/rpc/auth_des.h | 6 ------
tirpc/rpc/clnt.h | 36 ------------------------------------
tirpc/rpc/clnt_soc.h | 18 ------------------
tirpc/rpc/des_crypt.h | 12 ------------
tirpc/rpc/rpc.h | 6 ------
tirpc/rpc/svc.h | 42 ------------------------------------------
tirpc/rpc/svc_soc.h | 30 ------------------------------
tirpc/rpc/xdr.h | 6 ------
9 files changed, 204 deletions(-)
diff --git a/tirpc/rpc/auth.h b/tirpc/rpc/auth.h
index 5f8ea72..6f92b1e 100644
--- a/tirpc/rpc/auth.h
+++ b/tirpc/rpc/auth.h
@@ -152,9 +152,6 @@ typedef union des_block des_block;
extern "C" {
#endif
extern bool_t xdr_des_block(XDR *, des_block *);
-#ifdef __cplusplus
-}
-#endif
/*
* Authentication info. Opaque to client.
@@ -241,13 +238,7 @@ typedef struct __auth {
xfunc, xwhere))
-#ifdef __cplusplus
-extern "C" {
-#endif
extern struct opaque_auth _null_auth;
-#ifdef __cplusplus
-}
-#endif
/*
* Any style authentication. These routines can be used by any
@@ -268,15 +259,9 @@ int authany_wrap(void), authany_unwrap(void);
* int len;
* int *aup_gids;
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern AUTH *authunix_create(char *, uid_t, uid_t, int, uid_t *);
extern AUTH *authunix_create_default(void); /* takes no parameters */
extern AUTH *authnone_create(void); /* takes no parameters */
-#ifdef __cplusplus
-}
-#endif
/*
* DES style authentication
* AUTH *authsecdes_create(servername, window, timehost, ckey)
@@ -285,25 +270,13 @@ extern AUTH *authnone_create(void); /* takes no parameters */
* const char *timehost; - optional hostname to sync with
* des_block *ckey; - optional conversation key to use
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern AUTH *authdes_create (char *, u_int, struct sockaddr *, des_block *);
extern AUTH *authdes_pk_create (char *, netobj *, u_int,
struct sockaddr *, des_block *);
extern AUTH *authdes_seccreate (const char *, const u_int, const char *,
const des_block *);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
extern bool_t xdr_opaque_auth (XDR *, struct opaque_auth *);
-#ifdef __cplusplus
-}
-#endif
#define authsys_create(c,i1,i2,i3,ip) authunix_create((c),(i1),(i2),(i3),(ip))
#define authsys_create_default() authunix_create_default()
@@ -311,52 +284,31 @@ extern bool_t xdr_opaque_auth (XDR *, struct opaque_auth *);
/*
* Netname manipulation routines.
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern int getnetname(char *);
extern int host2netname(char *, const char *, const char *);
extern int user2netname(char *, const uid_t, const char *);
extern int netname2user(char *, uid_t *, gid_t *, int *, gid_t *);
extern int netname2host(char *, char *, const int);
extern void passwd2des ( char *, char * );
-#ifdef __cplusplus
-}
-#endif
/*
*
* These routines interface to the keyserv daemon
*
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern int key_decryptsession(const char *, des_block *);
extern int key_encryptsession(const char *, des_block *);
extern int key_gendes(des_block *);
extern int key_setsecret(const char *);
extern int key_secretkey_is_set(void);
-#ifdef __cplusplus
-}
-#endif
/*
* Publickey routines.
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern int getpublickey (const char *, char *);
extern int getpublicandprivatekey (char *, char *);
extern int getsecretkey (char *, char *, char *);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
struct svc_req;
struct rpc_msg;
enum auth_stat _svcauth_none (struct svc_req *, struct rpc_msg *);
diff --git a/tirpc/rpc/auth_des.h b/tirpc/rpc/auth_des.h
index 73103c6..91f0b47 100644
--- a/tirpc/rpc/auth_des.h
+++ b/tirpc/rpc/auth_des.h
@@ -118,13 +118,7 @@ struct authdes_verf {
extern "C" {
#endif
extern int authdes_getucred( struct authdes_cred *, uid_t *, gid_t *, int *, gid_t * );
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
extern bool_t xdr_authdes_cred(XDR *, struct authdes_cred *);
extern bool_t xdr_authdes_verf(XDR *, struct authdes_verf *);
extern int rtime(struct sockaddr_in *, struct timeval *,
diff --git a/tirpc/rpc/clnt.h b/tirpc/rpc/clnt.h
index 05f2215..9e47096 100644
--- a/tirpc/rpc/clnt.h
+++ b/tirpc/rpc/clnt.h
@@ -415,46 +415,25 @@ extern CLIENT *clnt_dg_create(const int, const struct netbuf *,
*/
extern CLIENT *clnt_raw_create(rpcprog_t, rpcvers_t);
-#ifdef __cplusplus
-}
-#endif
/*
* Print why creation failed
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern void clnt_pcreateerror(const char *); /* stderr */
extern char *clnt_spcreateerror(const char *); /* string */
-#ifdef __cplusplus
-}
-#endif
/*
* Like clnt_perror(), but is more verbose in its output
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern void clnt_perrno(enum clnt_stat); /* stderr */
extern char *clnt_sperrno(enum clnt_stat); /* string */
-#ifdef __cplusplus
-}
-#endif
/*
* Print an English error message, given the client error code
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern void clnt_perror(CLIENT *, const char *); /* stderr */
extern char *clnt_sperror(CLIENT *, const char *); /* string */
-#ifdef __cplusplus
-}
-#endif
/*
@@ -465,13 +444,7 @@ struct rpc_createerr {
struct rpc_err cf_error; /* useful when cf_stat == RPC_PMAPFAILURE */
};
-#ifdef __cplusplus
-extern "C" {
-#endif
extern struct rpc_createerr *__rpc_createerr(void);
-#ifdef __cplusplus
-}
-#endif
#define get_rpc_createerr() (*(__rpc_createerr()))
#define rpc_createerr (*(__rpc_createerr()))
@@ -488,16 +461,10 @@ extern struct rpc_createerr *__rpc_createerr(void);
* char *out;
* const char *nettype;
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern enum clnt_stat rpc_call(const char *, const rpcprog_t,
const rpcvers_t, const rpcproc_t,
const xdrproc_t, const char *,
const xdrproc_t, char *, const char *);
-#ifdef __cplusplus
-}
-#endif
/*
* RPC broadcast interface
@@ -545,9 +512,6 @@ extern enum clnt_stat rpc_call(const char *, const rpcprog_t,
typedef bool_t (*resultproc_t)(caddr_t, ...);
-#ifdef __cplusplus
-extern "C" {
-#endif
extern enum clnt_stat rpc_broadcast(const rpcprog_t, const rpcvers_t,
const rpcproc_t, const xdrproc_t,
caddr_t, const xdrproc_t, caddr_t,
diff --git a/tirpc/rpc/clnt_soc.h b/tirpc/rpc/clnt_soc.h
index 6ec545c..f517a95 100644
--- a/tirpc/rpc/clnt_soc.h
+++ b/tirpc/rpc/clnt_soc.h
@@ -65,34 +65,19 @@ extern "C" {
#endif
extern CLIENT *clnttcp_create(struct sockaddr_in *, u_long, u_long, int *,
u_int, u_int);
-#ifdef __cplusplus
-}
-#endif
/*
* Raw (memory) rpc.
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern CLIENT *clntraw_create(u_long, u_long);
-#ifdef __cplusplus
-}
-#endif
/*
IPv6 socket version
*/
#ifdef INET6
-#ifdef __cplusplus
-extern "C" {
-#endif
extern CLIENT *clnttcp6_create(struct sockaddr_in6 *, u_long, u_long, int *,
u_int, u_int);
-#ifdef __cplusplus
-}
-#endif
#endif
/*
@@ -116,9 +101,6 @@ extern CLIENT *clnttcp6_create(struct sockaddr_in6 *, u_long, u_long, int *,
* u_int sendsz;
* u_int recvsz;
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern CLIENT *clntudp_create(struct sockaddr_in *, u_long, u_long,
struct timeval, int *);
extern CLIENT *clntudp_bufcreate(struct sockaddr_in *, u_long, u_long,
diff --git a/tirpc/rpc/des_crypt.h b/tirpc/rpc/des_crypt.h
index 2358960..890bb73 100644
--- a/tirpc/rpc/des_crypt.h
+++ b/tirpc/rpc/des_crypt.h
@@ -86,28 +86,16 @@
extern "C" {
#endif
int cbc_crypt( char *, char *, unsigned int, unsigned int, char *);
-#ifdef __cplusplus
-}
-#endif
/*
* Electronic Code Book mode
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
int ecb_crypt( char *, char *, unsigned int, unsigned int );
-#ifdef __cplusplus
-}
-#endif
/*
* Set des parity for a key.
* DES parity is odd and in the low bit of each byte
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
void des_setparity( char *);
#ifdef __cplusplus
}
diff --git a/tirpc/rpc/rpc.h b/tirpc/rpc/rpc.h
index c3055ba..aa6a9a2 100644
--- a/tirpc/rpc/rpc.h
+++ b/tirpc/rpc/rpc.h
@@ -92,17 +92,11 @@ struct netbuf *uaddr2taddr(const struct netconfig *, const char *);
struct sockaddr;
extern int bindresvport_sa(int, struct sockaddr *);
-#ifdef __cplusplus
-}
-#endif
/*
* The following are not exported interfaces, they are for internal library
* and rpcbind use only. Do not use, they may change without notice.
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
int __rpc_nconf2fd(const struct netconfig *);
int __rpc_nconf2fd_flags(const struct netconfig *, int);
int __rpc_nconf2sockinfo(const struct netconfig *, struct __rpc_sockinfo *);
diff --git a/tirpc/rpc/svc.h b/tirpc/rpc/svc.h
index 6d176f0..d8433a9 100644
--- a/tirpc/rpc/svc.h
+++ b/tirpc/rpc/svc.h
@@ -205,9 +205,6 @@ extern "C" {
extern bool_t svc_reg(SVCXPRT *, const rpcprog_t, const rpcvers_t,
void (*)(struct svc_req *, SVCXPRT *),
const struct netconfig *);
-#ifdef __cplusplus
-}
-#endif
/*
* Service un-registration
@@ -217,13 +214,7 @@ extern bool_t svc_reg(SVCXPRT *, const rpcprog_t, const rpcvers_t,
* const rpcvers_t vers;
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern void svc_unreg(const rpcprog_t, const rpcvers_t);
-#ifdef __cplusplus
-}
-#endif
/*
* Transport registration.
@@ -231,13 +222,7 @@ extern void svc_unreg(const rpcprog_t, const rpcvers_t);
* xprt_register(xprt)
* SVCXPRT *xprt;
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern void xprt_register(SVCXPRT *);
-#ifdef __cplusplus
-}
-#endif
/*
* Transport un-register
@@ -245,13 +230,7 @@ extern void xprt_register(SVCXPRT *);
* xprt_unregister(xprt)
* SVCXPRT *xprt;
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern void xprt_unregister(SVCXPRT *);
-#ifdef __cplusplus
-}
-#endif
/*
@@ -280,9 +259,6 @@ extern void xprt_unregister(SVCXPRT *);
* deadlock the caller and server processes!
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern bool_t svc_sendreply(SVCXPRT *, xdrproc_t, void *);
extern void svcerr_decode(SVCXPRT *);
extern void svcerr_weakauth(SVCXPRT *);
@@ -294,9 +270,6 @@ extern void svcerr_systemerr(SVCXPRT *);
extern int rpc_reg(rpcprog_t, rpcvers_t, rpcproc_t,
char *(*)(char *), xdrproc_t, xdrproc_t,
char *);
-#ifdef __cplusplus
-}
-#endif
/*
* Lowest level dispatching -OR- who owns this process anyway.
@@ -323,17 +296,8 @@ extern int svc_max_pollfd;
* a small program implemented by the svc_rpc implementation itself;
* also see clnt.h for protocol numbers.
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern void rpctest_service(void);
-#ifdef __cplusplus
-}
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
extern void svc_getreq(int);
extern void svc_getreqset(fd_set *);
extern void svc_getreq_common(int);
@@ -342,9 +306,6 @@ extern void svc_getreq_poll(struct pollfd *, int);
extern void svc_run(void);
extern void svc_exit(void);
-#ifdef __cplusplus
-}
-#endif
/*
* Socket to use on svcxxx_create call to get default socket
@@ -356,9 +317,6 @@ extern void svc_exit(void);
* These are the existing service side transport implementations
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
/*
* Transport independent svc_create routine.
*/
diff --git a/tirpc/rpc/svc_soc.h b/tirpc/rpc/svc_soc.h
index 9b7befa..f9bbef4 100644
--- a/tirpc/rpc/svc_soc.h
+++ b/tirpc/rpc/svc_soc.h
@@ -68,9 +68,6 @@ extern "C" {
#endif
extern bool_t svc_register(SVCXPRT *, u_long, u_long,
void (*)(struct svc_req *, SVCXPRT *), int);
-#ifdef __cplusplus
-}
-#endif
/*
* Service un-registration
@@ -79,61 +76,34 @@ extern bool_t svc_register(SVCXPRT *, u_long, u_long,
* u_long prog;
* u_long vers;
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern void svc_unregister(u_long, u_long);
-#ifdef __cplusplus
-}
-#endif
/*
* Memory based rpc for testing and timing.
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern SVCXPRT *svcraw_create(void);
-#ifdef __cplusplus
-}
-#endif
/*
* Udp based rpc.
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern SVCXPRT *svcudp_create(int);
extern SVCXPRT *svcudp_bufcreate(int, u_int, u_int);
extern int svcudp_enablecache(SVCXPRT *, u_long);
extern SVCXPRT *svcudp6_create(int);
extern SVCXPRT *svcudp6_bufcreate(int, u_int, u_int);
-#ifdef __cplusplus
-}
-#endif
/*
* Tcp based rpc.
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern SVCXPRT *svctcp_create(int, u_int, u_int);
extern SVCXPRT *svctcp6_create(int, u_int, u_int);
-#ifdef __cplusplus
-}
-#endif
/*
* Fd based rpc.
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
extern SVCXPRT *svcfd_create(int, u_int, u_int);
#ifdef __cplusplus
}
diff --git a/tirpc/rpc/xdr.h b/tirpc/rpc/xdr.h
index 80b35ce..0765dbc 100644
--- a/tirpc/rpc/xdr.h
+++ b/tirpc/rpc/xdr.h
@@ -328,9 +328,6 @@ extern bool_t xdr_u_hyper(XDR *, u_quad_t *);
extern bool_t xdr_longlong_t(XDR *, quad_t *);
extern bool_t xdr_u_longlong_t(XDR *, u_quad_t *);
extern u_long xdr_sizeof(xdrproc_t, void *);
-#ifdef __cplusplus
-}
-#endif
/*
* Common opaque bytes objects used by many rpc protocols;
@@ -348,9 +345,6 @@ extern bool_t xdr_netobj(XDR *, struct netobj *);
* These are the public routines for the various implementations of
* xdr streams.
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
/* XDR using memory buffers */
extern void xdrmem_create(XDR *, char *, u_int, enum xdr_op);
--
2.7.3
prev parent reply other threads:[~2016-04-17 17:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-17 9:11 [PATCH 7/7] Deduplicate extern "C" blocks Felix Janda
2016-04-17 16:18 ` [Libtirpc-devel] " Mike Frysinger
2016-04-17 17:43 ` Felix Janda [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160417174330.GA637@nyan \
--to=felix.janda@posteo.de \
--cc=libtirpc-devel@lists.sourceforge.net \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.