From 053592bd3d5fcb79b8fa3a6f6193ffedfc041dba Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Wed, 12 Aug 2020 15:46:30 -0700 Subject: inclusive: change usage of sanity Google is working to change its source code to use more inclusive language. To that end, replace the term "sanity" with inclusive alternatives. BUG=b:163883397 BRANCH=None TEST=grep -ir sanity TEST=make runtests Signed-off-by: Daisuke Nojiri Change-Id: I708a044d89050c442f14fb11a8ae5e98490d56af Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2353420 Reviewed-by: Julius Werner --- cgpt/cgpt_add.c | 4 ++-- cgpt/cgpt_boot.c | 8 ++++---- cgpt/cgpt_common.c | 4 ++-- cgpt/cgpt_edit.c | 4 ++-- cgpt/cgpt_find.c | 2 +- cgpt/cgpt_legacy.c | 4 ++-- cgpt/cgpt_prioritize.c | 4 ++-- cgpt/cgpt_repair.c | 4 ++-- cgpt/cgpt_show.c | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) (limited to 'cgpt') diff --git a/cgpt/cgpt_add.c b/cgpt/cgpt_add.c index 09a86ba9..92677554 100644 --- a/cgpt/cgpt_add.c +++ b/cgpt/cgpt_add.c @@ -113,8 +113,8 @@ static int SetEntryAttributes(struct drive *drive, static int CgptCheckAddValidity(struct drive *drive) { int gpt_retval; - if (GPT_SUCCESS != (gpt_retval = GptSanityCheck(&drive->gpt))) { - Error("GptSanityCheck() returned %d: %s\n", + if (GPT_SUCCESS != (gpt_retval = GptValidityCheck(&drive->gpt))) { + Error("GptValidityCheck() returned %d: %s\n", gpt_retval, GptError(gpt_retval)); return -1; } diff --git a/cgpt/cgpt_boot.c b/cgpt/cgpt_boot.c index 989ffd79..d82720e4 100644 --- a/cgpt/cgpt_boot.c +++ b/cgpt/cgpt_boot.c @@ -25,8 +25,8 @@ int CgptGetBootPartitionNumber(CgptBootParams *params) { params->drive_size)) return CGPT_FAILED; - if (GPT_SUCCESS != (gpt_retval = GptSanityCheck(&drive.gpt))) { - Error("GptSanityCheck() returned %d: %s\n", + if (GPT_SUCCESS != (gpt_retval = GptValidityCheck(&drive.gpt))) { + Error("GptValidityCheck() returned %d: %s\n", gpt_retval, GptError(gpt_retval)); retval = CGPT_FAILED; goto done; @@ -106,8 +106,8 @@ int CgptBoot(CgptBootParams *params) { } if (params->partition) { - if (GPT_SUCCESS != (gpt_retval = GptSanityCheck(&drive.gpt))) { - Error("GptSanityCheck() returned %d: %s\n", + if (GPT_SUCCESS != (gpt_retval = GptValidityCheck(&drive.gpt))) { + Error("GptValidityCheck() returned %d: %s\n", gpt_retval, GptError(gpt_retval)); goto done; } diff --git a/cgpt/cgpt_common.c b/cgpt/cgpt_common.c index 6d3dcdb9..2ace9002 100644 --- a/cgpt/cgpt_common.c +++ b/cgpt/cgpt_common.c @@ -1042,8 +1042,8 @@ int CgptGetNumNonEmptyPartitions(CgptShowParams *params) { params->drive_size)) return CGPT_FAILED; - if (GPT_SUCCESS != (gpt_retval = GptSanityCheck(&drive.gpt))) { - Error("GptSanityCheck() returned %d: %s\n", + if (GPT_SUCCESS != (gpt_retval = GptValidityCheck(&drive.gpt))) { + Error("GptValidityCheck() returned %d: %s\n", gpt_retval, GptError(gpt_retval)); retval = CGPT_FAILED; goto done; diff --git a/cgpt/cgpt_edit.c b/cgpt/cgpt_edit.c index 6166d04a..963a8ac8 100644 --- a/cgpt/cgpt_edit.c +++ b/cgpt/cgpt_edit.c @@ -20,8 +20,8 @@ int CgptEdit(CgptEditParams *params) { params->drive_size)) return CGPT_FAILED; - if (GPT_SUCCESS != (gpt_retval = GptSanityCheck(&drive.gpt))) { - Error("GptSanityCheck() returned %d: %s\n", + if (GPT_SUCCESS != (gpt_retval = GptValidityCheck(&drive.gpt))) { + Error("GptValidityCheck() returned %d: %s\n", gpt_retval, GptError(gpt_retval)); goto bad; } diff --git a/cgpt/cgpt_find.c b/cgpt/cgpt_find.c index d3cbb0ba..6f4bbae5 100644 --- a/cgpt/cgpt_find.c +++ b/cgpt/cgpt_find.c @@ -120,7 +120,7 @@ static int gpt_search(CgptFindParams *params, struct drive *drive, int retval = 0; char partlabel[GPT_PARTNAME_LEN]; - if (GPT_SUCCESS != GptSanityCheck(&drive->gpt)) { + if (GPT_SUCCESS != GptValidityCheck(&drive->gpt)) { return 0; } diff --git a/cgpt/cgpt_legacy.c b/cgpt/cgpt_legacy.c index e51495ad..89b33e6a 100644 --- a/cgpt/cgpt_legacy.c +++ b/cgpt/cgpt_legacy.c @@ -21,8 +21,8 @@ int CgptLegacy(CgptLegacyParams *params) { params->drive_size)) return CGPT_FAILED; - if (GPT_SUCCESS != (gpt_retval = GptSanityCheck(&drive.gpt))) { - Error("GptSanityCheck() returned %d: %s\n", + if (GPT_SUCCESS != (gpt_retval = GptValidityCheck(&drive.gpt))) { + Error("GptValidityCheck() returned %d: %s\n", gpt_retval, GptError(gpt_retval)); goto bad; } diff --git a/cgpt/cgpt_prioritize.c b/cgpt/cgpt_prioritize.c index f81ca8a2..6d53f597 100644 --- a/cgpt/cgpt_prioritize.c +++ b/cgpt/cgpt_prioritize.c @@ -111,8 +111,8 @@ int CgptPrioritize(CgptPrioritizeParams *params) { params->drive_size)) return CGPT_FAILED; - if (GPT_SUCCESS != (gpt_retval = GptSanityCheck(&drive.gpt))) { - Error("GptSanityCheck() returned %d: %s\n", + if (GPT_SUCCESS != (gpt_retval = GptValidityCheck(&drive.gpt))) { + Error("GptValidityCheck() returned %d: %s\n", gpt_retval, GptError(gpt_retval)); goto bad; } diff --git a/cgpt/cgpt_repair.c b/cgpt/cgpt_repair.c index f06d118e..b4ddde63 100644 --- a/cgpt/cgpt_repair.c +++ b/cgpt/cgpt_repair.c @@ -19,9 +19,9 @@ int CgptRepair(CgptRepairParams *params) { params->drive_size)) return CGPT_FAILED; - int gpt_retval = GptSanityCheck(&drive.gpt); + int gpt_retval = GptValidityCheck(&drive.gpt); if (params->verbose) - printf("GptSanityCheck() returned %d: %s\n", + printf("GptValidityCheck() returned %d: %s\n", gpt_retval, GptError(gpt_retval)); GptRepair(&drive.gpt); diff --git a/cgpt/cgpt_show.c b/cgpt/cgpt_show.c index c1ea2400..3923815e 100644 --- a/cgpt/cgpt_show.c +++ b/cgpt/cgpt_show.c @@ -180,8 +180,8 @@ static void EntriesDetails(struct drive *drive, const int secondary, int raw) { static int GptShow(struct drive *drive, CgptShowParams *params) { int gpt_retval; - if (GPT_SUCCESS != (gpt_retval = GptSanityCheck(&drive->gpt))) { - Error("GptSanityCheck() returned %d: %s\n", + if (GPT_SUCCESS != (gpt_retval = GptValidityCheck(&drive->gpt))) { + Error("GptValidityCheck() returned %d: %s\n", gpt_retval, GptError(gpt_retval)); return CGPT_FAILED; } -- cgit v1.2.1