From fc249f81c789c59ff7d82ca9c6ee2ef0ac05b6e4 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sat, 26 Jul 2014 15:06:59 +0200 Subject: style: require comma after __ADD() macro $ sed -i 's/^\([\t ]\+\<__ADD\> \?([^)]\+)\) *$/\1,/' `git grep -w -l __ADD` Acked-by: Thomas Graf Signed-off-by: Thomas Haller --- lib/xfrm/ae.c | 38 ++++++++++++------------- lib/xfrm/sa.c | 80 ++++++++++++++++++++++++++--------------------------- lib/xfrm/sp.c | 58 +++++++++++++++++++------------------- lib/xfrm/template.c | 10 +++---- 4 files changed, 93 insertions(+), 93 deletions(-) (limited to 'lib/xfrm') diff --git a/lib/xfrm/ae.c b/lib/xfrm/ae.c index 79091d6c..a4db3002 100644 --- a/lib/xfrm/ae.c +++ b/lib/xfrm/ae.c @@ -238,17 +238,17 @@ static int xfrm_ae_compare(struct nl_object *_a, struct nl_object *_b, uint32_t */ static const struct trans_tbl ae_attrs[] = { - __ADD(XFRM_AE_ATTR_DADDR, daddr) - __ADD(XFRM_AE_ATTR_SPI, spi) - __ADD(XFRM_AE_ATTR_PROTO, protocol) - __ADD(XFRM_AE_ATTR_SADDR, saddr) - __ADD(XFRM_AE_ATTR_FLAGS, flags) - __ADD(XFRM_AE_ATTR_REQID, reqid) - __ADD(XFRM_AE_ATTR_MARK, mark) - __ADD(XFRM_AE_ATTR_LIFETIME, cur_lifetime) - __ADD(XFRM_AE_ATTR_REPLAY_MAXAGE, replay_maxage) - __ADD(XFRM_AE_ATTR_REPLAY_MAXDIFF, replay_maxdiff) - __ADD(XFRM_AE_ATTR_REPLAY_STATE, replay_state) + __ADD(XFRM_AE_ATTR_DADDR, daddr), + __ADD(XFRM_AE_ATTR_SPI, spi), + __ADD(XFRM_AE_ATTR_PROTO, protocol), + __ADD(XFRM_AE_ATTR_SADDR, saddr), + __ADD(XFRM_AE_ATTR_FLAGS, flags), + __ADD(XFRM_AE_ATTR_REQID, reqid), + __ADD(XFRM_AE_ATTR_MARK, mark), + __ADD(XFRM_AE_ATTR_LIFETIME, cur_lifetime), + __ADD(XFRM_AE_ATTR_REPLAY_MAXAGE, replay_maxage), + __ADD(XFRM_AE_ATTR_REPLAY_MAXDIFF, replay_maxdiff), + __ADD(XFRM_AE_ATTR_REPLAY_STATE, replay_state), }; static char* xfrm_ae_attrs2str (int attrs, char *buf, size_t len) @@ -263,14 +263,14 @@ static char* xfrm_ae_attrs2str (int attrs, char *buf, size_t len) */ static const struct trans_tbl ae_flags[] = { - __ADD(XFRM_AE_UNSPEC, unspecified) - __ADD(XFRM_AE_RTHR, replay threshold) - __ADD(XFRM_AE_RVAL, replay value) - __ADD(XFRM_AE_LVAL, lifetime value) - __ADD(XFRM_AE_ETHR, expiry time threshold) - __ADD(XFRM_AE_CR, replay update event) - __ADD(XFRM_AE_CE, timer expiry event) - __ADD(XFRM_AE_CU, policy update event) + __ADD(XFRM_AE_UNSPEC, unspecified), + __ADD(XFRM_AE_RTHR, replay threshold), + __ADD(XFRM_AE_RVAL, replay value), + __ADD(XFRM_AE_LVAL, lifetime value), + __ADD(XFRM_AE_ETHR, expiry time threshold), + __ADD(XFRM_AE_CR, replay update event), + __ADD(XFRM_AE_CE, timer expiry event), + __ADD(XFRM_AE_CU, policy update event), }; char* xfrmnl_ae_flags2str(int flags, char *buf, size_t len) diff --git a/lib/xfrm/sa.c b/lib/xfrm/sa.c index dc887a06..07633e53 100644 --- a/lib/xfrm/sa.c +++ b/lib/xfrm/sa.c @@ -299,33 +299,33 @@ static int xfrm_sa_compare(struct nl_object *_a, struct nl_object *_b, uint32_t * @{ */ static const struct trans_tbl sa_attrs[] = { - __ADD(XFRM_SA_ATTR_SEL, selector) - __ADD(XFRM_SA_ATTR_DADDR, daddr) - __ADD(XFRM_SA_ATTR_SPI, spi) - __ADD(XFRM_SA_ATTR_PROTO, proto) - __ADD(XFRM_SA_ATTR_SADDR, saddr) - __ADD(XFRM_SA_ATTR_LTIME_CFG, lifetime_cfg) - __ADD(XFRM_SA_ATTR_LTIME_CUR, lifetime_cur) - __ADD(XFRM_SA_ATTR_STATS, stats) - __ADD(XFRM_SA_ATTR_SEQ, seqnum) - __ADD(XFRM_SA_ATTR_REQID, reqid) - __ADD(XFRM_SA_ATTR_FAMILY, family) - __ADD(XFRM_SA_ATTR_MODE, mode) - __ADD(XFRM_SA_ATTR_REPLAY_WIN, replay_window) - __ADD(XFRM_SA_ATTR_FLAGS, flags) - __ADD(XFRM_SA_ATTR_ALG_AEAD, alg_aead) - __ADD(XFRM_SA_ATTR_ALG_AUTH, alg_auth) - __ADD(XFRM_SA_ATTR_ALG_CRYPT, alg_crypto) - __ADD(XFRM_SA_ATTR_ALG_COMP, alg_comp) - __ADD(XFRM_SA_ATTR_ENCAP, encap) - __ADD(XFRM_SA_ATTR_TFCPAD, tfcpad) - __ADD(XFRM_SA_ATTR_COADDR, coaddr) - __ADD(XFRM_SA_ATTR_MARK, mark) - __ADD(XFRM_SA_ATTR_SECCTX, sec_ctx) - __ADD(XFRM_SA_ATTR_REPLAY_MAXAGE, replay_maxage) - __ADD(XFRM_SA_ATTR_REPLAY_MAXDIFF, replay_maxdiff) - __ADD(XFRM_SA_ATTR_REPLAY_STATE, replay_state) - __ADD(XFRM_SA_ATTR_EXPIRE, expire) + __ADD(XFRM_SA_ATTR_SEL, selector), + __ADD(XFRM_SA_ATTR_DADDR, daddr), + __ADD(XFRM_SA_ATTR_SPI, spi), + __ADD(XFRM_SA_ATTR_PROTO, proto), + __ADD(XFRM_SA_ATTR_SADDR, saddr), + __ADD(XFRM_SA_ATTR_LTIME_CFG, lifetime_cfg), + __ADD(XFRM_SA_ATTR_LTIME_CUR, lifetime_cur), + __ADD(XFRM_SA_ATTR_STATS, stats), + __ADD(XFRM_SA_ATTR_SEQ, seqnum), + __ADD(XFRM_SA_ATTR_REQID, reqid), + __ADD(XFRM_SA_ATTR_FAMILY, family), + __ADD(XFRM_SA_ATTR_MODE, mode), + __ADD(XFRM_SA_ATTR_REPLAY_WIN, replay_window), + __ADD(XFRM_SA_ATTR_FLAGS, flags), + __ADD(XFRM_SA_ATTR_ALG_AEAD, alg_aead), + __ADD(XFRM_SA_ATTR_ALG_AUTH, alg_auth), + __ADD(XFRM_SA_ATTR_ALG_CRYPT, alg_crypto), + __ADD(XFRM_SA_ATTR_ALG_COMP, alg_comp), + __ADD(XFRM_SA_ATTR_ENCAP, encap), + __ADD(XFRM_SA_ATTR_TFCPAD, tfcpad), + __ADD(XFRM_SA_ATTR_COADDR, coaddr), + __ADD(XFRM_SA_ATTR_MARK, mark), + __ADD(XFRM_SA_ATTR_SECCTX, sec_ctx), + __ADD(XFRM_SA_ATTR_REPLAY_MAXAGE, replay_maxage), + __ADD(XFRM_SA_ATTR_REPLAY_MAXDIFF, replay_maxdiff), + __ADD(XFRM_SA_ATTR_REPLAY_STATE, replay_state), + __ADD(XFRM_SA_ATTR_EXPIRE, expire), }; static char* xfrm_sa_attrs2str(int attrs, char *buf, size_t len) @@ -339,14 +339,14 @@ static char* xfrm_sa_attrs2str(int attrs, char *buf, size_t len) * @{ */ static const struct trans_tbl sa_flags[] = { - __ADD(XFRM_STATE_NOECN, no ecn) - __ADD(XFRM_STATE_DECAP_DSCP, decap dscp) - __ADD(XFRM_STATE_NOPMTUDISC, no pmtu discovery) - __ADD(XFRM_STATE_WILDRECV, wild receive) - __ADD(XFRM_STATE_ICMP, icmp) - __ADD(XFRM_STATE_AF_UNSPEC, unspecified) - __ADD(XFRM_STATE_ALIGN4, align4) - __ADD(XFRM_STATE_ESN, esn) + __ADD(XFRM_STATE_NOECN, no ecn), + __ADD(XFRM_STATE_DECAP_DSCP, decap dscp), + __ADD(XFRM_STATE_NOPMTUDISC, no pmtu discovery), + __ADD(XFRM_STATE_WILDRECV, wild receive), + __ADD(XFRM_STATE_ICMP, icmp), + __ADD(XFRM_STATE_AF_UNSPEC, unspecified), + __ADD(XFRM_STATE_ALIGN4, align4), + __ADD(XFRM_STATE_ESN, esn), }; char* xfrmnl_sa_flags2str(int flags, char *buf, size_t len) @@ -365,11 +365,11 @@ int xfrmnl_sa_str2flag(const char *name) * @{ */ static const struct trans_tbl sa_modes[] = { - __ADD(XFRM_MODE_TRANSPORT, transport) - __ADD(XFRM_MODE_TUNNEL, tunnel) - __ADD(XFRM_MODE_ROUTEOPTIMIZATION, route optimization) - __ADD(XFRM_MODE_IN_TRIGGER, in trigger) - __ADD(XFRM_MODE_BEET, beet) + __ADD(XFRM_MODE_TRANSPORT, transport), + __ADD(XFRM_MODE_TUNNEL, tunnel), + __ADD(XFRM_MODE_ROUTEOPTIMIZATION, route optimization), + __ADD(XFRM_MODE_IN_TRIGGER, in trigger), + __ADD(XFRM_MODE_BEET, beet), }; char* xfrmnl_sa_mode2str(int mode, char *buf, size_t len) diff --git a/lib/xfrm/sp.c b/lib/xfrm/sp.c index e66924ba..cf162975 100644 --- a/lib/xfrm/sp.c +++ b/lib/xfrm/sp.c @@ -180,19 +180,19 @@ static int xfrm_sp_compare(struct nl_object *_a, struct nl_object *_b, uint32_t * @{ */ static const struct trans_tbl sp_attrs[] = { - __ADD(XFRM_SP_ATTR_SEL, selector) - __ADD(XFRM_SP_ATTR_LTIME_CFG, lifetime_cfg) - __ADD(XFRM_SP_ATTR_LTIME_CUR, lifetime_cur) - __ADD(XFRM_SP_ATTR_PRIO, priority) - __ADD(XFRM_SP_ATTR_INDEX, index) - __ADD(XFRM_SP_ATTR_DIR, direction) - __ADD(XFRM_SP_ATTR_ACTION, action) - __ADD(XFRM_SP_ATTR_FLAGS, flags) - __ADD(XFRM_SP_ATTR_SHARE, share) - __ADD(XFRM_SP_ATTR_POLTYPE, policy_type) - __ADD(XFRM_SP_ATTR_SECCTX, security_context) - __ADD(XFRM_SP_ATTR_TMPL, user_template) - __ADD(XFRM_SP_ATTR_MARK, mark) + __ADD(XFRM_SP_ATTR_SEL, selector), + __ADD(XFRM_SP_ATTR_LTIME_CFG, lifetime_cfg), + __ADD(XFRM_SP_ATTR_LTIME_CUR, lifetime_cur), + __ADD(XFRM_SP_ATTR_PRIO, priority), + __ADD(XFRM_SP_ATTR_INDEX, index), + __ADD(XFRM_SP_ATTR_DIR, direction), + __ADD(XFRM_SP_ATTR_ACTION, action), + __ADD(XFRM_SP_ATTR_FLAGS, flags), + __ADD(XFRM_SP_ATTR_SHARE, share), + __ADD(XFRM_SP_ATTR_POLTYPE, policy_type), + __ADD(XFRM_SP_ATTR_SECCTX, security_context), + __ADD(XFRM_SP_ATTR_TMPL, user_template), + __ADD(XFRM_SP_ATTR_MARK, mark), }; static char* xfrm_sp_attrs2str(int attrs, char *buf, size_t len) @@ -206,8 +206,8 @@ static char* xfrm_sp_attrs2str(int attrs, char *buf, size_t len) * @{ */ static const struct trans_tbl sa_actions[] = { - __ADD(XFRM_POLICY_ALLOW, allow) - __ADD(XFRM_POLICY_BLOCK, block) + __ADD(XFRM_POLICY_ALLOW, allow), + __ADD(XFRM_POLICY_BLOCK, block), }; char* xfrmnl_sp_action2str(int action, char *buf, size_t len) @@ -226,8 +226,8 @@ int xfrmnl_sp_str2action(const char *name) * @{ */ static const struct trans_tbl sp_flags[] = { - __ADD(XFRM_POLICY_LOCALOK, allow policy override by user) - __ADD(XFRM_POLICY_ICMP, auto include ICMP in policy) + __ADD(XFRM_POLICY_LOCALOK, allow policy override by user), + __ADD(XFRM_POLICY_ICMP, auto include ICMP in policy), }; char* xfrmnl_sp_flags2str(int flags, char *buf, size_t len) @@ -246,10 +246,10 @@ int xfrmnl_sp_str2flag(const char *name) * @{ */ static const struct trans_tbl sp_types[] = { - __ADD(XFRM_POLICY_TYPE_MAIN, main) - __ADD(XFRM_POLICY_TYPE_SUB, sub) - __ADD(XFRM_POLICY_TYPE_MAX, max) - __ADD(XFRM_POLICY_TYPE_ANY, any) + __ADD(XFRM_POLICY_TYPE_MAIN, main), + __ADD(XFRM_POLICY_TYPE_SUB, sub), + __ADD(XFRM_POLICY_TYPE_MAX, max), + __ADD(XFRM_POLICY_TYPE_ANY, any), }; char* xfrmnl_sp_type2str(int type, char *buf, size_t len) @@ -268,10 +268,10 @@ int xfrmnl_sp_str2type(const char *name) * @{ */ static const struct trans_tbl sp_dir[] = { - __ADD(XFRM_POLICY_IN, in) - __ADD(XFRM_POLICY_OUT, out) - __ADD(XFRM_POLICY_FWD, fwd) - __ADD(XFRM_POLICY_MASK, mask) + __ADD(XFRM_POLICY_IN, in), + __ADD(XFRM_POLICY_OUT, out), + __ADD(XFRM_POLICY_FWD, fwd), + __ADD(XFRM_POLICY_MASK, mask), }; char* xfrmnl_sp_dir2str(int dir, char *buf, size_t len) @@ -295,10 +295,10 @@ int xfrmnl_sp_index2dir (unsigned int index) * @{ */ static const struct trans_tbl sp_share[] = { - __ADD(XFRM_SHARE_ANY, any) - __ADD(XFRM_SHARE_SESSION, session) - __ADD(XFRM_SHARE_USER, user) - __ADD(XFRM_SHARE_UNIQUE, unique) + __ADD(XFRM_SHARE_ANY, any), + __ADD(XFRM_SHARE_SESSION, session), + __ADD(XFRM_SHARE_USER, user), + __ADD(XFRM_SHARE_UNIQUE, unique), }; char* xfrmnl_sp_share2str(int share, char *buf, size_t len) diff --git a/lib/xfrm/template.c b/lib/xfrm/template.c index 6ab8fb56..5d6d8c9e 100644 --- a/lib/xfrm/template.c +++ b/lib/xfrm/template.c @@ -107,11 +107,11 @@ struct xfrmnl_user_tmpl* xfrmnl_user_tmpl_clone(struct xfrmnl_user_tmpl* utmpl) * @{ */ static const struct trans_tbl tmpl_modes[] = { - __ADD(XFRM_MODE_TRANSPORT, transport) - __ADD(XFRM_MODE_TUNNEL, tunnel) - __ADD(XFRM_MODE_ROUTEOPTIMIZATION, route optimization) - __ADD(XFRM_MODE_IN_TRIGGER, in trigger) - __ADD(XFRM_MODE_BEET, beet) + __ADD(XFRM_MODE_TRANSPORT, transport), + __ADD(XFRM_MODE_TUNNEL, tunnel), + __ADD(XFRM_MODE_ROUTEOPTIMIZATION, route optimization), + __ADD(XFRM_MODE_IN_TRIGGER, in trigger), + __ADD(XFRM_MODE_BEET, beet), }; char* xfrmnl_user_tmpl_mode2str(int mode, char *buf, size_t len) -- cgit v1.2.3