From: Dmitry V. Levin <ldv@altlinux.org>
Date: Thu, 30 Jun 2016 22:39:02 +0000 (+0000)
Subject: msghdr.c: merge print_cmsg_ip_ttl and print_cmsg_ip_checksum
X-Git-Tag: v4.13~78
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b7937bd72e354508be941f3f109a3ac6b6f43ecb;p=strace

msghdr.c: merge print_cmsg_ip_ttl and print_cmsg_ip_checksum

* msghdr.c (print_cmsg_ip_ttl): Rename to print_cmsg_uint.
(print_cmsg_ip_checksum): Remove.
(print_cmsg_type_data): Replace print_cmsg_ip_ttl
and print_cmsg_ip_checksum with print_cmsg_uint.
---

diff --git a/msghdr.c b/msghdr.c
index bd15da00..ca61da1c 100644
--- a/msghdr.c
+++ b/msghdr.c
@@ -55,8 +55,7 @@ typedef union {
 } union_cmsghdr;
 
 static void
-print_scm_rights(struct tcb *tcp, const void *cmsg_data,
-		 const size_t data_len)
+print_scm_rights(struct tcb *tcp, const void *cmsg_data, const size_t data_len)
 {
 	const int *fds = cmsg_data;
 	const size_t nfds = data_len / sizeof(*fds);
@@ -77,8 +76,7 @@ print_scm_rights(struct tcb *tcp, const void *cmsg_data,
 }
 
 static void
-print_scm_creds(struct tcb *tcp, const void *cmsg_data,
-		const size_t data_len)
+print_scm_creds(struct tcb *tcp, const void *cmsg_data, const size_t data_len)
 {
 	const struct ucred *uc = cmsg_data;
 
@@ -118,15 +116,14 @@ print_cmsg_ip_pktinfo(struct tcb *tcp, const void *cmsg_data,
 }
 
 static void
-print_cmsg_ip_ttl(struct tcb *tcp, const void *cmsg_data,
-		  const size_t data_len)
+print_cmsg_uint(struct tcb *tcp, const void *cmsg_data, const size_t data_len)
 {
-	const unsigned int *ttl = cmsg_data;
+	const unsigned int *p = cmsg_data;
 
-	if (sizeof(*ttl) > data_len)
+	if (sizeof(*p) > data_len)
 		return;
 
-	tprintf(", cmsg_data=[%u]", *ttl);
+	tprintf(", cmsg_data=[%u]", *p);
 }
 
 static void
@@ -141,18 +138,6 @@ print_cmsg_ip_tos(struct tcb *tcp, const void *cmsg_data,
 	tprintf(", cmsg_data=[%#x]", *tos);
 }
 
-static void
-print_cmsg_ip_checksum(struct tcb *tcp, const void *cmsg_data,
-		       const size_t data_len)
-{
-	const uint32_t *csum = cmsg_data;
-
-	if (sizeof(*csum) > data_len)
-		return;
-
-	tprintf(", cmsg_data=[%u]", *csum);
-}
-
 static void
 print_cmsg_ip_opts(struct tcb *tcp, const void *cmsg_data,
 		   const size_t data_len)
@@ -236,7 +221,7 @@ print_cmsg_type_data(struct tcb *tcp, const int cmsg_level, const int cmsg_type,
 			print_cmsg_ip_pktinfo(tcp, cmsg_data, data_len);
 			break;
 		case IP_TTL:
-			print_cmsg_ip_ttl(tcp, cmsg_data, data_len);
+			print_cmsg_uint(tcp, cmsg_data, data_len);
 			break;
 		case IP_TOS:
 			print_cmsg_ip_tos(tcp, cmsg_data, data_len);
@@ -252,7 +237,7 @@ print_cmsg_type_data(struct tcb *tcp, const int cmsg_level, const int cmsg_type,
 			print_cmsg_ip_origdstaddr(tcp, cmsg_data, data_len);
 			break;
 		case IP_CHECKSUM:
-			print_cmsg_ip_checksum(tcp, cmsg_data, data_len);
+			print_cmsg_uint(tcp, cmsg_data, data_len);
 			break;
 		case SCM_SECURITY:
 			print_scm_security(tcp, cmsg_data, data_len);