]> granicus.if.org Git - strace/commitdiff
tests: pass index to print_elem_ callback in TEST_NLATTR_NESTED_ARRAY
authorEugene Syromyatnikov <evgsyr@gmail.com>
Fri, 25 May 2018 03:08:04 +0000 (05:08 +0200)
committerDmitry V. Levin <ldv@altlinux.org>
Wed, 6 Jun 2018 15:10:37 +0000 (15:10 +0000)
* tests/test_nlattr.h (TEST_NLATTR_NESTED_ARRAY): Pass array index
to the print_elem_ callback.
* tests/nlattr_tca_stab.c (print_uint16): Add index argument.

tests/nlattr_tca_stab.c
tests/test_nlattr.h

index 690a50533838bdd798e429a930a8ab5ca3f81739..593ba94fb2708ac7583697c3aac1dc546894b5bc 100644 (file)
@@ -76,7 +76,7 @@ print_tcmsg(const unsigned int msg_len)
 }
 
 static void
-print_uint16(const uint16_t *p)
+print_uint16(const uint16_t *p, size_t idx)
 {
        printf("%u", *p);
 }
index 84125e009cd6a9194d0d3bafe9f214b14aa0a942..0b8fb8879d41c4c9c6663517bf4ba2d9aaadc4c0 100644 (file)
@@ -292,7 +292,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_) */                        \
@@ -306,7 +306,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(TEST_NLATTR_nla)                \
@@ -322,7 +322,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)