tests: pass index to print_elem_ callback in TEST_NLATTR_ARRAY

* tests/test_nlattr.h (TEST_NLATTR_ARRAY): Pass array index to the
print_elem_ callback.
* tests/nlattr_inet_diag_msg.c (print_uint): Add index argument.
* tests/nlattr_netlink_diag_msg.c (print_xlong): Likewise.
* tests/nlattr_packet_diag_msg.c (print_packet_diag_mclist,
print_sock_filter): Likewise.
* tests/nlattr_unix_diag_msg.c (print_uint): Likewise.

diff --git a/tests/nlattr_inet_diag_msg.c b/tests/nlattr_inet_diag_msg.c
index 752d35ee9ce6823d53e1f72c423c9fed3b4ee86c..7360055fd6c066e9475f5ca0b44dabb3e4c7a267 100644 (file)
--- a/tests/nlattr_inet_diag_msg.c
+++ b/tests/nlattr_inet_diag_msg.c
@@ -77,7 +77,7 @@ print_inet_diag_msg(const unsigned int msg_len)
 }
 
 static void
-print_uint(const unsigned int *p)
+print_uint(const unsigned int *p, size_t i)
 {
        printf("%u", *p);
 }

diff --git a/tests/nlattr_netlink_diag_msg.c b/tests/nlattr_netlink_diag_msg.c
index 17afc58b7eac0ed820edfe2df6d676587adf0b8e..8291570f6a1f1d27e05b08c05e9950fe4cdee2a9 100644 (file)
--- a/tests/nlattr_netlink_diag_msg.c
+++ b/tests/nlattr_netlink_diag_msg.c
@@ -66,7 +66,7 @@ print_netlink_diag_msg(const unsigned int msg_len)
 }
 
 static void
-print_xlong(const unsigned long *p)
+print_xlong(const unsigned long *p, size_t i)
 {
        printf("%#lx", *p);
 }

diff --git a/tests/nlattr_packet_diag_msg.c b/tests/nlattr_packet_diag_msg.c
index 12cefcf94cbbe14b41ce4cbcd1d0b434afd466fa..9f35513900754a7fe2f62c58514e32b9bd8bdd13 100644 (file)
--- a/tests/nlattr_packet_diag_msg.c
+++ b/tests/nlattr_packet_diag_msg.c
@@ -67,7 +67,7 @@ print_packet_diag_msg(const unsigned int msg_len)
 }
 
 static void
-print_packet_diag_mclist(const struct packet_diag_mclist *const dml)
+print_packet_diag_mclist(const struct packet_diag_mclist *const dml, size_t i)
 {
        printf("{pdmc_index=" IFINDEX_LO_STR);
        PRINT_FIELD_U(", ", *dml, pdmc_count);
@@ -84,7 +84,7 @@ static const struct sock_filter filter[] = {
 };
 
 static void
-print_sock_filter(const struct sock_filter *const f)
+print_sock_filter(const struct sock_filter *const f, size_t i)
 {
        if (f == filter)
                printf("BPF_STMT(BPF_LD|BPF_B|BPF_ABS"

diff --git a/tests/nlattr_unix_diag_msg.c b/tests/nlattr_unix_diag_msg.c
index 488891c39d186a6494a44befdc3e8487d5c1ccb9..30a8d2f39fc82db2ccdc423afc7f1f0c5088d943 100644 (file)
--- a/tests/nlattr_unix_diag_msg.c
+++ b/tests/nlattr_unix_diag_msg.c
@@ -65,7 +65,7 @@ print_unix_diag_msg(const unsigned int msg_len)
 }
 
 static void
-print_uint(const unsigned int *p)
+print_uint(const unsigned int *p, size_t i)
 {
        printf("%u", *p);
 }

diff --git a/tests/test_nlattr.h b/tests/test_nlattr.h
index 30211a47d586dcb47daffaf54c75b39b2589a574..be092c3b4c4503a19fd033a750d5182ea318762d 100644 (file)
--- a/tests/test_nlattr.h
+++ b/tests/test_nlattr.h
@@ -170,7 +170,7 @@ print_nlattr(const unsigned int nla_len, const char *const nla_type)
                        size_t i;                                       \
                        for (i = 0; i < ARRAY_SIZE(obj_) - 1; ++i) {    \
                                if (i) printf(", ");                    \
-                               (print_elem_)(&(obj_)[i]);              \
+                               (print_elem_)(&(obj_)[i], i);           \
                        }                                               \
                        printf("]"));                                   \
                /* short read of sizeof(obj_) */                        \
@@ -183,7 +183,7 @@ print_nlattr(const unsigned int nla_len, const char *const nla_type)
                        size_t i;                                       \
                        for (i = 0; i < ARRAY_SIZE(obj_) - 1; ++i) {    \
                                if (i) printf(", ");                    \
-                               (print_elem_)(&(obj_)[i]);              \
+                               (print_elem_)(&(obj_)[i], i);           \
                        }                                               \
                        printf(", %p]",                                 \
                               RTA_DATA(NLMSG_ATTR(nlh, (hdrlen_)))     \
@@ -198,7 +198,7 @@ print_nlattr(const unsigned int nla_len, const char *const nla_type)
                        size_t i;                                       \
                        for (i = 0; i < ARRAY_SIZE(obj_); ++i) {        \
                                if (i) printf(", ");                    \
-                               (print_elem_)(&(obj_)[i]);              \
+                               (print_elem_)(&(obj_)[i], i);           \
                        }                                               \
                        printf("]"));                                   \
        } while (0)