COIL: Change sane to inclusive words
BUG=b:163883397
BRANCH=None
TEST=make runtests
TEST=egrep -r -i -I '(sane|insane)'
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Change-Id: I109207575e2c00d6aa3b0ed17de7f699087a9658
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2369464
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/Makefile b/Makefile
index 637ca87..8f1bd14 100644
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,7 @@
HOST_ARCH ?= ${_machname}
# ARCH and/or FIRMWARE_ARCH are defined by the Chromium OS ebuild.
-# Pick a sane target architecture if none is defined.
+# Pick a valid target architecture if none is defined.
ifeq (${ARCH},)
ARCH := ${HOST_ARCH}
endif
diff --git a/firmware/2lib/2common.c b/firmware/2lib/2common.c
index 782ea63..a88bc2e 100644
--- a/firmware/2lib/2common.c
+++ b/firmware/2lib/2common.c
@@ -250,7 +250,7 @@
return VB2_ERROR_KEYBLOCK_SIG_OUTSIDE;
}
- /* Make sure advertised signature data sizes are sane. */
+ /* Make sure advertised signature data sizes are valid. */
if (block->keyblock_size < sig->data_size) {
VB2_DEBUG("Signature calculated past end of block\n");
return VB2_ERROR_KEYBLOCK_SIGNED_TOO_MUCH;
@@ -335,7 +335,7 @@
return VB2_ERROR_PREAMBLE_SIG_OUTSIDE;
}
- /* Make sure advertised signature data sizes are sane. */
+ /* Make sure advertised signature data sizes are valid. */
if (preamble->preamble_size < sig->data_size) {
VB2_DEBUG("Signature calculated past end of the block\n");
return VB2_ERROR_PREAMBLE_SIGNED_TOO_MUCH;
diff --git a/firmware/lib/cgptlib/include/cgptlib_internal.h b/firmware/lib/cgptlib/include/cgptlib_internal.h
index 10ffa39..8066031 100644
--- a/firmware/lib/cgptlib/include/cgptlib_internal.h
+++ b/firmware/lib/cgptlib/include/cgptlib_internal.h
@@ -85,7 +85,7 @@
};
/**
- * Verify GptData parameters are sane.
+ * Verify GptData parameters are valid.
*/
int CheckParameters(GptData* gpt);
diff --git a/firmware/lib20/kernel.c b/firmware/lib20/kernel.c
index e1422a4..298b14f 100644
--- a/firmware/lib20/kernel.c
+++ b/firmware/lib20/kernel.c
@@ -265,7 +265,7 @@
return VB2_ERROR_PREAMBLE_SIG_OUTSIDE;
}
- /* Make sure advertised signature data sizes are sane. */
+ /* Make sure advertised signature data sizes are valid. */
if (preamble->preamble_size < sig->data_size) {
VB2_DEBUG("Signature calculated past end of the block\n");
return VB2_ERROR_PREAMBLE_SIGNED_TOO_MUCH;
diff --git a/firmware/lib20/misc.c b/firmware/lib20/misc.c
index a2d5b23..6ad3cab 100644
--- a/firmware/lib20/misc.c
+++ b/firmware/lib20/misc.c
@@ -99,7 +99,7 @@
VB2_TRY(vb2_verify_packed_key_inside(kb, block_size, &kb->data_key));
/* Save the future offset and size while kb->data_key is still valid.
- The check above made sure that key_offset and key_size are sane. */
+ The check above made sure that key_offset and key_size are valid. */
sd->data_key_offset = vb2_offset_of(sd, key_data);
sd->data_key_size = kb->data_key.key_offset + kb->data_key.key_size;
diff --git a/tests/cgpt_fuzzer.c b/tests/cgpt_fuzzer.c
index 51ba72a..d440ee8 100644
--- a/tests/cgpt_fuzzer.c
+++ b/tests/cgpt_fuzzer.c
@@ -49,7 +49,7 @@
}
memcpy(¶ms, data, sizeof(params));
- // Enforce a sane sector size. The sector size must accommodate the GPT
+ // Enforce a valid sector size. The sector size must accommodate the GPT
// header (the code assumes this) and large values don't make sense
// either (both in terms of actual hardware parameters and ability for
// the fuzzer to deal with effectively).
diff --git a/tests/cgptlib_test.c b/tests/cgptlib_test.c
index 39d3aeb..6fd7c32 100644
--- a/tests/cgptlib_test.c
+++ b/tests/cgptlib_test.c
@@ -859,7 +859,7 @@
GptEntry *e1 = (GptEntry *)gpt->primary_entries;
uint8_t *tempptr;
- /* Unmodified test data is completely sane */
+ /* Unmodified test data is completely valid. */
BuildTestGptData(gpt);
EXPECT(GPT_SUCCESS == GptValidityCheck(gpt));
EXPECT(MASK_BOTH == gpt->valid_headers);
diff --git a/unblocked_terms.txt b/unblocked_terms.txt
index 543a2f1..c54d786 100644
--- a/unblocked_terms.txt
+++ b/unblocked_terms.txt
@@ -1,4 +1,3 @@
dummy
master
-sane
slave
\ No newline at end of file
