From: Eugene Syromyatnikov <evgsyr@gmail.com>
Date: Tue, 25 Jul 2017 10:57:11 +0000 (+0200)
Subject: Add terminating comment after each DECL_* macro definition
X-Git-Tag: v4.19~210
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=861e50b6df434ac690613c54ad75aaefc9743e74;p=strace

Add terminating comment after each DECL_* macro definition

In an attempt to improve readability.

* defs.h (DECL_IOCTL, DECL_NETLINK, DECL_PRINTNUM, DECL_PRINTNUM_ADDR,
ATTRIBUTE_FORMAT): Add comment that marks end of macro definition.
* netlink_sock_diag (DECL_NETLINK_DIAG_DECODER): Likewise.
* nlattr.h (DECL_NLA): Likewise.
---

diff --git a/defs.h b/defs.h
index 8aca8083..87265bdb 100644
--- a/defs.h
+++ b/defs.h
@@ -689,7 +689,9 @@ extern unsigned int qual_flags(const unsigned int);
 
 #define DECL_IOCTL(name)						\
 extern int								\
-name ## _ioctl(struct tcb *, unsigned int request, kernel_ulong_t arg)
+name ## _ioctl(struct tcb *, unsigned int request, kernel_ulong_t arg)	\
+/* End of DECL_IOCTL definition. */
+
 DECL_IOCTL(dm);
 DECL_IOCTL(file);
 DECL_IOCTL(fs_x);
@@ -711,7 +713,9 @@ typedef bool (*netlink_decoder_t)(struct tcb *, const struct nlmsghdr *,
 #define DECL_NETLINK(name)						\
 extern bool								\
 decode_netlink_ ## name(struct tcb *, const struct nlmsghdr *,		\
-			kernel_ulong_t addr, unsigned int len)
+			kernel_ulong_t addr, unsigned int len)		\
+/* End of DECL_NETLINK definition. */
+
 DECL_NETLINK(crypto);
 DECL_NETLINK(selinux);
 DECL_NETLINK(sock_diag);
@@ -850,7 +854,9 @@ extern unsigned current_klongsize;
 #define DECL_PRINTNUM(name)						\
 extern bool								\
 printnum_ ## name(struct tcb *, kernel_ulong_t addr, const char *fmt)	\
-	ATTRIBUTE_FORMAT((printf, 3, 0))
+	ATTRIBUTE_FORMAT((printf, 3, 0))				\
+/* End of DECL_PRINTNUM definition. */
+
 DECL_PRINTNUM(short);
 DECL_PRINTNUM(int);
 DECL_PRINTNUM(int64);
@@ -858,7 +864,9 @@ DECL_PRINTNUM(int64);
 
 #define DECL_PRINTNUM_ADDR(name)					\
 extern bool								\
-printnum_addr_ ## name(struct tcb *, kernel_ulong_t addr)
+printnum_addr_ ## name(struct tcb *, kernel_ulong_t addr)		\
+/* End of DECL_PRINTNUM_ADDR definition. */
+
 DECL_PRINTNUM_ADDR(int);
 DECL_PRINTNUM_ADDR(int64);
 #undef DECL_PRINTNUM_ADDR
@@ -907,7 +915,9 @@ extern bool printnum_addr_klong_int(struct tcb *, kernel_ulong_t addr);
 #define DECL_PRINTPAIR(name)						\
 extern bool								\
 printpair_ ## name(struct tcb *, kernel_ulong_t addr, const char *fmt)	\
-	ATTRIBUTE_FORMAT((printf, 3, 0))
+	ATTRIBUTE_FORMAT((printf, 3, 0))				\
+/* End of DECL_PRINTPAIR definition. */
+
 DECL_PRINTPAIR(int);
 DECL_PRINTPAIR(int64);
 #undef DECL_PRINTPAIR
diff --git a/netlink_sock_diag.h b/netlink_sock_diag.h
index af99bc83..0fc820b1 100644
--- a/netlink_sock_diag.h
+++ b/netlink_sock_diag.h
@@ -35,7 +35,8 @@ diag_decode_name(struct tcb *tcp,			\
 		 const struct nlmsghdr *nlmsghdr,	\
 		 uint8_t family,			\
 		 kernel_ulong_t addr,			\
-		 unsigned int len)
+		 unsigned int len)			\
+/* End of DECL_NETLINK_DIAG_DECODER definition. */
 
 extern DECL_NETLINK_DIAG_DECODER(decode_inet_diag_msg);
 extern DECL_NETLINK_DIAG_DECODER(decode_inet_diag_req);
diff --git a/nlattr.h b/nlattr.h
index 8e580868..9437883c 100644
--- a/nlattr.h
+++ b/nlattr.h
@@ -45,7 +45,9 @@ decode_nlattr(struct tcb *,
 #define DECL_NLA(name)					\
 extern bool						\
 decode_nla_ ## name(struct tcb *, kernel_ulong_t addr,	\
-		    unsigned int len, const void *)
+		    unsigned int len, const void *)	\
+/* End of DECL_NLA definition. */
+
 DECL_NLA(u8);
 DECL_NLA(u16);
 DECL_NLA(u32);