[PATCH v2 08/29] xfsprogs: Stop using platform_uuid_unparse()

Pavel Reichl
2021-08-06T21:23:38Z

---
db/fprint.c | 2 +-
db/sb.c | 6 +++---
libxlog/util.c | 4 ++--
logprint/log_misc.c | 2 +-
repair/agheader.c | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/db/fprint.c b/db/fprint.c
index 65accfda..f2f42c28 100644
--- a/db/fprint.c
+++ b/db/fprint.c
@@ -273,7 +273,7 @@ fp_uuid(
i++, p++) {
if (array)
dbprintf("%d:", i + base);
- platform_uuid_unparse(p, bp);
+ uuid_unparse(*p, bp);
dbprintf("%s", bp);
if (i < count - 1)
dbprintf(" ");
diff --git a/db/sb.c b/db/sb.c
index b668fc68..4e4b1f57 100644
--- a/db/sb.c
+++ b/db/sb.c
@@ -396,7 +396,7 @@ uuid_f(
return 0;
}
memcpy(&uu, uup, sizeof(uuid_t));
- platform_uuid_unparse(&uu, bp);
+ uuid_unparse(uu, bp);
dbprintf(_("old UUID = %s\n"), bp);
} else if (!strcasecmp(argv[1], "restore")) {
xfs_sb_t tsb;
@@ -427,7 +427,7 @@ uuid_f(
break;
}

- platform_uuid_unparse(&uu, bp);
+ uuid_unparse(uu, bp);
dbprintf(_("new UUID = %s\n"), bp);
return 0;

@@ -460,7 +460,7 @@ uuid_f(
"for FS with an external log\n"));
}

- platform_uuid_unparse(&uu, bp);
+ uuid_unparse(uu, bp);
dbprintf(_("UUID = %s\n"), bp);
}

diff --git a/libxlog/util.c b/libxlog/util.c
index b4dfeca0..7c10474b 100644
--- a/libxlog/util.c
+++ b/libxlog/util.c
@@ -79,8 +79,8 @@ header_check_uuid(xfs_mount_t *mp, xlog_rec_header_t *head)
if (!uuid_compare(mp->m_sb.sb_uuid, head->h_fs_uuid))
return 0;

- platform_uuid_unparse(&mp->m_sb.sb_uuid, uu_sb);
- platform_uuid_unparse(&head->h_fs_uuid, uu_log);
+ uuid_unparse(mp->m_sb.sb_uuid, uu_sb);
+ uuid_unparse(head->h_fs_uuid, uu_log);

printf(_("* ERROR: mismatched uuid in log\n"
"* SB : %s\n* log: %s\n"),
diff --git a/logprint/log_misc.c b/logprint/log_misc.c
index afcd2cee..c593c828 100644
--- a/logprint/log_misc.c
+++ b/logprint/log_misc.c
@@ -1082,7 +1082,7 @@ xlog_print_rec_head(xlog_rec_header_t *head, int *len, int bad_hdr_warn)
printf("\n");
}

- platform_uuid_unparse(&head->h_fs_uuid, uub);
+ uuid_unparse(head->h_fs_uuid, uub);
printf(_("uuid: %s format: "), uub);
switch (be32_to_cpu(head->h_fmt)) {
case XLOG_FMT_UNKNOWN:
diff --git a/repair/agheader.c b/repair/agheader.c
index b13b7323..7e596a66 100644
--- a/repair/agheader.c
+++ b/repair/agheader.c
@@ -104,7 +104,7 @@ verify_set_agf(xfs_mount_t *mp, xfs_agf_t *agf, xfs_agnumber_t i)
char uu[64];

retval = XR_AG_AGF;
- platform_uuid_unparse(&agf->agf_uuid, uu);
+ uuid_unparse(agf->agf_uuid, uu);
do_warn(_("bad uuid %s for agf %d\n"), uu, i);

if (!no_modify)
@@ -183,7 +183,7 @@ verify_set_agi(xfs_mount_t *mp, xfs_agi_t *agi, xfs_agnumber_t agno)
char uu[64];

retval = XR_AG_AGI;
- platform_uuid_unparse(&agi->agi_uuid, uu);
+ uuid_unparse(agi->agi_uuid, uu);
do_warn(_("bad uuid %s for agi %d\n"), uu, agno);

if (!no_modify)
--
2.31.1