From: Dmitry V. Levin <ldv@altlinux.org>
Date: Sun, 20 Aug 2017 11:10:03 +0000 (+0000)
Subject: print_inet_addr: add support of invocations without field name
X-Git-Tag: v4.19~76
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3cbf90920e5fe97712cea61c851c00dddd056c7;p=strace

print_inet_addr: add support of invocations without field name

Prepare print_inet_addr for use in structureless contexts where
no structure field name is available.

* sockaddr.c (print_inet_addr): Handle var_name == NULL.
---

diff --git a/sockaddr.c b/sockaddr.c
index 1d14bfdd..81d861ba 100644
--- a/sockaddr.c
+++ b/sockaddr.c
@@ -94,20 +94,27 @@ print_inet_addr(const int af,
 	switch (af) {
 	case AF_INET:
 		if (inet_ntop(af, addr, buf, sizeof(buf))) {
-			tprintf("%s=inet_addr(\"%s\")", var_name, buf);
+			if (var_name)
+				tprintf("%s=inet_addr(\"%s\")", var_name, buf);
+			else
+				tprints(buf);
 			return true;
 		}
 		break;
 	case AF_INET6:
 		if (inet_ntop(af, addr, buf, sizeof(buf))) {
-			tprintf("inet_pton(%s, \"%s\", &%s)",
-				"AF_INET6", buf, var_name);
+			if (var_name)
+				tprintf("inet_pton(%s, \"%s\", &%s)",
+					"AF_INET6", buf, var_name);
+			else
+				tprints(buf);
 			return true;
 		}
 		break;
 	}
 
-	tprintf("%s=", var_name);
+	if (var_name)
+		tprintf("%s=", var_name);
 	print_quoted_string(addr, len, QUOTE_FORCE_HEX);
 	return false;
 }