summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2021-01-20 17:52:51 +0800
committerCommit Bot <commit-bot@chromium.org>2021-01-28 03:52:09 +0000
commit7eb8739a244b4b7f52ef7b14f2ce97ae9cec714b (patch)
treefd3ccdacdcbd0c874cbb2132685c916bd4cd62c0
parent3a525ff3af462ec2c20b3f7a25c0cfbb1ef8ab57 (diff)
downloadvboot-7eb8739a244b4b7f52ef7b14f2ce97ae9cec714b.tar.gz
vboot: make @return keyword consistent in function docstrings
s/@returns/@return/g for consistency. BUG=b:124141368 TEST=make clean && make runtests BRANCH=none Signed-off-by: Joel Kitching <kitching@google.com> Change-Id: If5ef147761111294b0eca532e56e683fd787bee6 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2641345 Tested-by: Joel Kitching <kitching@chromium.org> Commit-Queue: Joel Kitching <kitching@chromium.org> Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
-rw-r--r--firmware/2lib/include/2api.h16
-rw-r--r--firmware/2lib/include/2recovery_reasons.h2
-rw-r--r--firmware/2lib/include/2ui.h8
3 files changed, 13 insertions, 13 deletions
diff --git a/firmware/2lib/include/2api.h b/firmware/2lib/include/2api.h
index 94f0df5c..5ea06e2f 100644
--- a/firmware/2lib/include/2api.h
+++ b/firmware/2lib/include/2api.h
@@ -1005,7 +1005,7 @@ void vb2ex_abort(void);
* caller may not get a chance to commit this data.
*
* @param ctx Vboot context
- * @returns VB2_SUCCESS, or non-zero error code.
+ * @return VB2_SUCCESS, or non-zero error code.
*/
vb2_error_t vb2ex_commit_data(struct vb2_context *ctx);
@@ -1015,7 +1015,7 @@ vb2_error_t vb2ex_commit_data(struct vb2_context *ctx);
/**
* Initialize the TPM.
*
- * @returns VB2_SUCCESS, or non-zero error code.
+ * @return VB2_SUCCESS, or non-zero error code.
*/
vb2_error_t vb2ex_tpm_init(void);
@@ -1026,7 +1026,7 @@ vb2_error_t vb2ex_tpm_init(void);
* TPM_TakeOwnership, since the TPM device can be opened only by one process at
* a time.
*
- * @returns VB2_SUCCESS, or non-zero error code.
+ * @return VB2_SUCCESS, or non-zero error code.
*/
vb2_error_t vb2ex_tpm_close(void);
vb2_error_t vb2ex_tpm_open(void);
@@ -1061,7 +1061,7 @@ uint32_t vb2ex_tpm_send_recv(const uint8_t *request, uint32_t request_length,
* the TPM RNG directly. Otherwise, an attacker with communication interception
* abilities could launch replay attacks by reusing previous nonces.
*
- * @returns VB2_SUCCESS, or non-zero error code.
+ * @return VB2_SUCCESS, or non-zero error code.
*/
vb2_error_t vb2ex_tpm_get_random(uint8_t *buf, uint32_t length);
@@ -1093,7 +1093,7 @@ enum vb2_tpm_mode {
*
* @param mode_val Desired TPM mode to set. May be one of ENABLED
* or DISABLED from vb2_tpm_mode enum.
- * @returns VB2_SUCCESS, or non-zero error code.
+ * @return VB2_SUCCESS, or non-zero error code.
*/
vb2_error_t vb2ex_tpm_set_mode(enum vb2_tpm_mode mode_val);
@@ -1410,21 +1410,21 @@ vb2_error_t vb2ex_display_ui(enum vb2_screen screen,
/**
* Check that physical presence button is currently pressed by the user.
*
- * @returns 1 for pressed, 0 for not.
+ * @return 1 for pressed, 0 for not.
*/
int vb2ex_physical_presence_pressed(void);
/**
* Get the number of supported locales.
*
- * @returns Number of locales. 0 if none or on error.
+ * @return Number of locales. 0 if none or on error.
*/
uint32_t vb2ex_get_locale_count(void);
/**
* Return the number of available alternate bootloaders.
*
- * @returns Number of alternate bootloaders. 0 if none or on error.
+ * @return Number of alternate bootloaders. 0 if none or on error.
*/
uint32_t vb2ex_get_bootloader_count(void);
diff --git a/firmware/2lib/include/2recovery_reasons.h b/firmware/2lib/include/2recovery_reasons.h
index 514ee4f4..e8cff424 100644
--- a/firmware/2lib/include/2recovery_reasons.h
+++ b/firmware/2lib/include/2recovery_reasons.h
@@ -14,7 +14,7 @@
* Return a description of the recovery reason code.
*
* @param recovery reason code
- * @returns A string literal with English description of the recovery reason
+ * @return A string literal with English description of the recovery reason
*/
const char *vb2_get_recovery_reason_string(uint8_t code);
diff --git a/firmware/2lib/include/2ui.h b/firmware/2lib/include/2ui.h
index 77c5acf4..2e1f3651 100644
--- a/firmware/2lib/include/2ui.h
+++ b/firmware/2lib/include/2ui.h
@@ -219,7 +219,7 @@ vb2_error_t vb2_ui_screen_change(struct vb2_ui_context *ui, enum vb2_screen id);
* If a timeout occurs, take the default boot action.
*
* @param ctx Vboot context
- * @returns VB2_SUCCESS, or non-zero error code.
+ * @return VB2_SUCCESS, or non-zero error code.
*/
vb2_error_t vb2_developer_menu(struct vb2_context *ctx);
@@ -230,7 +230,7 @@ vb2_error_t vb2_developer_menu(struct vb2_context *ctx);
* encountered last boot. Wait for the user to physically reset or shut down.
*
* @param ctx Vboot context
- * @returns VB2_SUCCESS, or non-zero error code.
+ * @return VB2_SUCCESS, or non-zero error code.
*/
vb2_error_t vb2_broken_recovery_menu(struct vb2_context *ctx);
@@ -241,7 +241,7 @@ vb2_error_t vb2_broken_recovery_menu(struct vb2_context *ctx);
* navigate the step-by-step recovery, or enter developer mode if allowed.
*
* @param ctx Vboot context
- * @returns VB2_SUCCESS, or non-zero error code.
+ * @return VB2_SUCCESS, or non-zero error code.
*/
vb2_error_t vb2_manual_recovery_menu(struct vb2_context *ctx);
@@ -252,7 +252,7 @@ vb2_error_t vb2_manual_recovery_menu(struct vb2_context *ctx);
* diagnostic tests of various hardware components.
*
* @param ctx Vboot context
- * @returns VB2_SUCCESS, or non-zero error code.
+ * @return VB2_SUCCESS, or non-zero error code.
*/
vb2_error_t vb2_diagnostic_menu(struct vb2_context *ctx);