Commit 41fef0ee authored May 03, 2008 by Marcin Slusarz Committed by David S. Miller May 03, 2008

xfrm: convert empty xfrm_audit_* macros to functions



it removes these warnings when CONFIG_AUDITSYSCALL is unset:

net/xfrm/xfrm_user.c: In function 'xfrm_add_sa':
net/xfrm/xfrm_user.c:412: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:411: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:410: warning: unused variable 'loginuid'
net/xfrm/xfrm_user.c: In function 'xfrm_del_sa':
net/xfrm/xfrm_user.c:485: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:484: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:483: warning: unused variable 'loginuid'
net/xfrm/xfrm_user.c: In function 'xfrm_add_policy':
net/xfrm/xfrm_user.c:1132: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:1131: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:1130: warning: unused variable 'loginuid'
net/xfrm/xfrm_user.c: In function 'xfrm_get_policy':
net/xfrm/xfrm_user.c:1382: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:1381: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:1380: warning: unused variable 'loginuid'
net/xfrm/xfrm_user.c: In function 'xfrm_add_pol_expire':
net/xfrm/xfrm_user.c:1620: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:1619: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:1618: warning: unused variable 'loginuid'
net/xfrm/xfrm_user.c: In function 'xfrm_add_sa_expire':
net/xfrm/xfrm_user.c:1658: warning: unused variable 'sid'
net/xfrm/xfrm_user.c:1657: warning: unused variable 'sessionid'
net/xfrm/xfrm_user.c:1656: warning: unused variable 'loginuid'

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c8005785

include/net/xfrm.h

+40 −8

Original line number	Diff line number	Diff line
		@@ -648,14 +648,46 @@ extern void xfrm_audit_state_notfound(struct sk_buff *skb, u16 family,
		extern void xfrm_audit_state_icvfail(struct xfrm_state *x,
		struct sk_buff *skb, u8 proto);
		#else
		#define xfrm_audit_policy_add(x, r, a, se, s) do { ; } while (0)
		#define xfrm_audit_policy_delete(x, r, a, se, s) do { ; } while (0)
		#define xfrm_audit_state_add(x, r, a, se, s) do { ; } while (0)
		#define xfrm_audit_state_delete(x, r, a, se, s) do { ; } while (0)
		#define xfrm_audit_state_replay_overflow(x, s) do { ; } while (0)
		#define xfrm_audit_state_notfound_simple(s, f) do { ; } while (0)
		#define xfrm_audit_state_notfound(s, f, sp, sq) do { ; } while (0)
		#define xfrm_audit_state_icvfail(x, s, p) do { ; } while (0)

		static inline void xfrm_audit_policy_add(struct xfrm_policy *xp, int result,
		u32 auid, u32 ses, u32 secid)
		{
		}

		static inline void xfrm_audit_policy_delete(struct xfrm_policy *xp, int result,
		u32 auid, u32 ses, u32 secid)
		{
		}

		static inline void xfrm_audit_state_add(struct xfrm_state *x, int result,
		u32 auid, u32 ses, u32 secid)
		{
		}

		static inline void xfrm_audit_state_delete(struct xfrm_state *x, int result,
		u32 auid, u32 ses, u32 secid)
		{
		}

		static inline void xfrm_audit_state_replay_overflow(struct xfrm_state *x,
		struct sk_buff *skb)
		{
		}

		static inline void xfrm_audit_state_notfound_simple(struct sk_buff *skb,
		u16 family)
		{
		}

		static inline void xfrm_audit_state_notfound(struct sk_buff *skb, u16 family,
		__be32 net_spi, __be32 net_seq)
		{
		}

		static inline void xfrm_audit_state_icvfail(struct xfrm_state *x,
		struct sk_buff *skb, u8 proto)
		{
		}
		#endif /* CONFIG_AUDITSYSCALL */

		static inline void xfrm_pol_hold(struct xfrm_policy *policy)

Admin message