Make print_uint64 from btrfs.c globally available

And rename it to print_uint64_array_member to make the name sensible
without additional context.

* defs.h (print_uint64_array_member): New function prototype.
* btrfs.c (print_uint64): Move...
* util.c (print_uint64_array_member): ...here, drop "static" qualifier.

diff --git a/btrfs.c b/btrfs.c
index ff10d69a29fa5aa5615122420e4e09595632092e..6f47a34a133c9162ab7b36c27c6f9b23c4bbcf52 100644 (file)
--- a/btrfs.c
+++ b/btrfs.c
@@ -366,14 +366,6 @@ btrfs_print_ino_path_container(struct tcb *tcp,
        btrfs_print_data_container_footer();
 }
 
-static bool
-print_uint64(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
-{
-       tprintf("%" PRIu64, *(uint64_t *) elem_buf);
-
-       return true;
-}
-
 static void
 btrfs_print_qgroup_inherit(struct tcb *const tcp, const kernel_ulong_t qgi_addr)
 {
@@ -400,7 +392,7 @@ btrfs_print_qgroup_inherit(struct tcb *const tcp, const kernel_ulong_t qgi_addr)
                uint64_t record;
                print_array(tcp, qgi_addr + offsetof(typeof(inherit), qgroups),
                            inherit.num_qgroups, &record, sizeof(record),
-                           umoven_or_printaddr, print_uint64, 0);
+                           umoven_or_printaddr, print_uint64_array_member, 0);
        }
        tprints("}");
 }

diff --git a/defs.h b/defs.h
index 4cb68dbd6c5742cacdb5b863be7a481c227e852b..28285c931451713a700c15834d492c1b8f6a55ce 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -493,6 +493,8 @@ umovestr(struct tcb *, kernel_ulong_t addr, unsigned int len, char *laddr);
 extern int upeek(struct tcb *tcp, unsigned long, kernel_ulong_t *);
 extern int upoke(struct tcb *tcp, unsigned long, kernel_ulong_t);
 
+extern bool print_uint64_array_member(struct tcb *tcp, void *elem_buf,
+                                     size_t elem_size, void *data);
 extern bool
 print_array(struct tcb *,
            kernel_ulong_t start_addr,

diff --git a/util.c b/util.c
index edec6c7a88722001a77afb614ef45b857ee8de86..468904d7d767a0cca2602ee2b0b2a25976ca9b4d 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1008,6 +1008,15 @@ umoven_or_printaddr64_ignore_syserror(struct tcb *const tcp,
        return 0;
 }
 
+bool
+print_uint64_array_member(struct tcb *tcp, void *elem_buf, size_t elem_size,
+                         void *data)
+{
+       tprintf("%" PRIu64, *(uint64_t *) elem_buf);
+
+       return true;
+}
+
 /*
  * Iteratively fetch and print up to nmemb elements of elem_size size
  * from the array that starts at tracee's address start_addr.