diff --git a/print_statfs.c b/print_statfs.c index 3bfac9b5..49b6cd1e 100644 --- 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 0fa45109..11e9f0b1 100644 --- 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 372fc916..d8288f1f 100644 --- 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);