2024-05-10 09:33:29

by Siddh Raman Pant

Subject: [PATCH] objtool: builtin-check: Use "action" in opts_valid error message to be consistent with help

The help message mentions the main options as "actions", which is
different from the optional "options". But the check error messages
outputs "option" or "command" for referring to actions.

Hence, make the error messages consistent with help.

Signed-off-by: Siddh Raman Pant <[email protected]>
---
tools/objtool/builtin-check.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/objtool/builtin-check.c b/tools/objtool/builtin-check.c
index 5e21cfb7661d..387d56a7f5fb 100644
--- a/tools/objtool/builtin-check.c
+++ b/tools/objtool/builtin-check.c
@@ -144,7 +144,7 @@ static bool opts_valid(void)
opts.static_call ||
opts.uaccess) {
if (opts.dump_orc) {
- ERROR("--dump can't be combined with other options");
+ ERROR("--dump can't be combined with other actions");
return false;
}

@@ -159,7 +159,7 @@ static bool opts_valid(void)
if (opts.dump_orc)
return true;

- ERROR("At least one command required");
+ ERROR("At least one action required");
return false;
}

--
2.43.0

2024-05-10 19:44:38

by Josh Poimboeuf

Subject: Re: [PATCH] objtool: builtin-check: Use "action" in opts_valid error message to be consistent with help

On Fri, May 10, 2024 at 03:02:57PM +0530, Siddh Raman Pant wrote:
> The help message mentions the main options as "actions", which is
> different from the optional "options". But the check error messages
> outputs "option" or "command" for referring to actions.
>
> Hence, make the error messages consistent with help.
>
> Signed-off-by: Siddh Raman Pant <[email protected]>

Queued, thanks!

--
Josh