statfs: fix printing format of f_fsid field

* print_statfs.c: Print f_fsid as a structure containing field "val"
which, in turn, is an array of two elements that used to be printed
as members of f_fsid structure.
* tests/statfs.expected: Update expected output.
* tests/xstatfsx.c (print_statfs): Likewise.

diff --git a/print_statfs.c b/print_statfs.c
index 3bfac9b51e7a3827b5add57ca9784f01abcf43dd..49b6cd1ee19ba199b826eaa99e040f5f91690474 100644 (file)
--- a/print_statfs.c
+++ b/print_statfs.c
@@ -73,9 +73,9 @@ print_struct_statfs(struct tcb *tcp, const long addr)
        print_statfs_number(", f_ffree=", b.f_ffree);
 # if defined HAVE_STRUCT_STATFS_F_FSID_VAL \
   || defined HAVE_STRUCT_STATFS_F_FSID___VAL
-       print_statfs_number(", f_fsid={", b.f_fsid[0]);
+       print_statfs_number(", f_fsid={val=[", b.f_fsid[0]);
        print_statfs_number(", ", b.f_fsid[1]);
-       tprints("}");
+       tprints("]}");
 # endif
        print_statfs_number(", f_namelen=", b.f_namelen);
 # ifdef HAVE_STRUCT_STATFS_F_FRSIZE
@@ -108,9 +108,9 @@ print_struct_statfs64(struct tcb *tcp, const long addr, const unsigned long size
        print_statfs_number(", f_ffree=", b.f_ffree);
 # if defined HAVE_STRUCT_STATFS64_F_FSID_VAL \
   || defined HAVE_STRUCT_STATFS64_F_FSID___VAL
-       print_statfs_number(", f_fsid={", b.f_fsid[0]);
+       print_statfs_number(", f_fsid={val=[", b.f_fsid[0]);
        print_statfs_number(", ", b.f_fsid[1]);
-       tprints("}");
+       tprints("]}");
 # endif
        print_statfs_number(", f_namelen=", b.f_namelen);
 # ifdef HAVE_STRUCT_STATFS64_F_FRSIZE

diff --git a/tests/statfs.expected b/tests/statfs.expected
index 0fa45109d1b194ffe9ac4df845d773f76bb293b1..11e9f0b157839fa7fbe1566a63181354dcce3136 100644 (file)
--- a/tests/statfs.expected
+++ b/tests/statfs.expected
@@ -1 +1 @@
-statfs(64)?\("/proc/self/status"(, [1-9][0-9]*)?, \{f_type=PROC_SUPER_MAGIC, f_bsize=[1-9][0-9]*, f_blocks=[0-9]+, f_bfree=[0-9]+, f_bavail=[0-9]+, f_files=[0-9]+, f_ffree=[0-9]+, f_fsid=\{[0-9]+, [0-9]+\}, f_namelen=[1-9][0-9]*(, f_frsize=[0-9]+)?(, f_flags=ST_VALID(\|ST_[A-Z]+)*)?\}\) += 0
+statfs(64)?\("/proc/self/status"(, [1-9][0-9]*)?, \{f_type=PROC_SUPER_MAGIC, f_bsize=[1-9][0-9]*, f_blocks=[0-9]+, f_bfree=[0-9]+, f_bavail=[0-9]+, f_files=[0-9]+, f_ffree=[0-9]+, f_fsid=\{val=\[[0-9]+, [0-9]+\]\}, f_namelen=[1-9][0-9]*(, f_frsize=[0-9]+)?(, f_flags=ST_VALID(\|ST_[A-Z]+)*)?\}\) += 0

diff --git a/tests/xstatfsx.c b/tests/xstatfsx.c
index 372fc916d71c48c25b90e135271b9a87710ecf68..d8288f1ffd5478e882f7cb879d3bb66aa831f572 100644 (file)
--- a/tests/xstatfsx.c
+++ b/tests/xstatfsx.c
@@ -81,7 +81,7 @@ print_statfs(const char *const sample, const char *magic_str)
        PRINT_NUM(f_files);
        PRINT_NUM(f_ffree);
 #ifdef PRINT_F_FSID
-       printf(", f_fsid={%u, %u}",
+       printf(", f_fsid={val=[%u, %u]}",
               (unsigned) b->PRINT_F_FSID[0], (unsigned) b->PRINT_F_FSID[1]);
 #endif
        PRINT_NUM(f_namelen);