net.c: fix printing field names of struct sockaddr_nl

* net.c (print_sockaddr_data_nl): Change "pid" to "nl_pid", "groups"
to "nl_groups".  Print sockaddr_nl.nl_groups using %#08x format.
* tests/net-yy-netlink.c (main): Update.

diff --git a/net.c b/net.c
index 651a1d0521ba075f7f52a36f3d1360cdd25eb625..a5d9ee44ab17807b8dad60990c81e9cf01809ca1 100644 (file)
--- a/net.c
+++ b/net.c
@@ -196,7 +196,8 @@ print_sockaddr_data_nl(const void *const buf, const int addrlen)
 {
        const struct sockaddr_nl *const sa_nl = buf;
 
-       tprintf("pid=%d, groups=%08x", sa_nl->nl_pid, sa_nl->nl_groups);
+       tprintf("nl_pid=%d, nl_groups=%#08x",
+               sa_nl->nl_pid, sa_nl->nl_groups);
 }
 
 static void

diff --git a/tests/net-yy-netlink.c b/tests/net-yy-netlink.c
index e52cfedd4ba07ec07463ee487f526270f3fa7ab8..64d0efca574808dbcf6e0b41c40aca95f0783062 100644 (file)
--- a/tests/net-yy-netlink.c
+++ b/tests/net-yy-netlink.c
@@ -66,13 +66,13 @@ main(void)
        if (bind(fd, sa, *len))
                perror_msg_and_skip("bind");
        printf("bind(%d<NETLINK:[%lu]>, {sa_family=AF_NETLINK"
-              ", pid=%u, groups=00000000}, %u) = 0\n",
+              ", nl_pid=%u, nl_groups=00000000}, %u) = 0\n",
               fd, inode, magic, (unsigned) *len);
 
        if (getsockname(fd, sa, len))
                perror_msg_and_fail("getsockname");
        printf("getsockname(%d<NETLINK:[SOCK_DIAG:%u]>, {sa_family=AF_NETLINK"
-              ", pid=%u, groups=00000000}, [%u]) = 0\n",
+              ", nl_pid=%u, nl_groups=00000000}, [%u]) = 0\n",
               fd, magic, magic, (unsigned) *len);
 
        if (close(fd))