[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/37] qemu-io-cmds: Simplify help_oneline
From: |
Kevin Wolf |
Subject: |
[PULL 04/37] qemu-io-cmds: Simplify help_oneline |
Date: |
Fri, 2 Oct 2020 16:43:12 +0200 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
help_oneline is declared and starts as:
static void help_oneline(const char *cmd, const cmdinfo_t *ct)
{
if (cmd) {
printf("%s ", cmd);
} else {
printf("%s ", ct->name);
if (ct->altname) {
printf("(or %s) ", ct->altname);
}
}
However, there are only two routes to help_oneline being called:
help_f -> help_all -> help_oneline(ct->name, ct)
help_f -> help_onecmd(argv[1], ct)
In the first case, 'cmd' and 'ct->name' are the same thing,
so it's impossible for the if (cmd) to be false and then validly
print ct->name - this is upsetting gcc
( https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96739 )
In the second case, cmd is argv[1] and we know we've got argv[1]
so again (cmd) is non-NULL.
Simplify help_oneline by just printing cmd.
(Also strengthen argc check just to be pedantic)
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20200824102914.105619-1-dgilbert@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
qemu-io-cmds.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index baeae86d8c..4153f1c0b0 100644
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -2383,14 +2383,7 @@ static const cmdinfo_t sleep_cmd = {
static void help_oneline(const char *cmd, const cmdinfo_t *ct)
{
- if (cmd) {
- printf("%s ", cmd);
- } else {
- printf("%s ", ct->name);
- if (ct->altname) {
- printf("(or %s) ", ct->altname);
- }
- }
+ printf("%s ", cmd);
if (ct->args) {
printf("%s ", ct->args);
@@ -2420,7 +2413,7 @@ static int help_f(BlockBackend *blk, int argc, char
**argv)
{
const cmdinfo_t *ct;
- if (argc == 1) {
+ if (argc < 2) {
help_all();
return 0;
}
--
2.25.4
- [PULL 00/37] Block layer patches, Kevin Wolf, 2020/10/02
- [PULL 01/37] block/sheepdog: Replace magic val by NANOSECONDS_PER_SECOND definition, Kevin Wolf, 2020/10/02
- [PULL 02/37] tests/check-block: Do not run the iotests with old versions of bash, Kevin Wolf, 2020/10/02
- [PULL 04/37] qemu-io-cmds: Simplify help_oneline,
Kevin Wolf <=
- [PULL 03/37] docs: Document the throttle block filter, Kevin Wolf, 2020/10/02
- [PULL 05/37] nbd: Remove unused nbd_export_get_blockdev(), Kevin Wolf, 2020/10/02
- [PULL 08/37] block/export: Add BlockExport infrastructure and block-export-add, Kevin Wolf, 2020/10/02
- [PULL 06/37] qapi: Create block-export module, Kevin Wolf, 2020/10/02
- [PULL 09/37] qemu-storage-daemon: Use qmp_block_export_add(), Kevin Wolf, 2020/10/02
- [PULL 07/37] qapi: Rename BlockExport to BlockExportOptions, Kevin Wolf, 2020/10/02
- [PULL 11/37] block/export: Remove magic from block-export-add, Kevin Wolf, 2020/10/02
- [PULL 10/37] qemu-nbd: Use raw block driver for --offset, Kevin Wolf, 2020/10/02
- [PULL 12/37] nbd: Add max-connections to nbd-server-start, Kevin Wolf, 2020/10/02
- [PULL 13/37] nbd: Add writethrough to block-export-add, Kevin Wolf, 2020/10/02