From 88cdee70b9d467aa0dffa5f24852b83db8c385ef Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Tue, 11 Apr 2017 23:51:35 +0300 Subject: [PATCH] sbin/hammer: Add /* not reached */ for usage() variants that were originally missing. Recommended by dillon@. No diff in sbin/hammer binary when assert(3) is disabled. --- sbin/hammer/cmd_dedup.c | 8 ++++++-- sbin/hammer/cmd_mirror.c | 18 +++++++++++++----- sbin/hammer/cmd_pfs.c | 20 +++++++++++++++----- sbin/hammer/cmd_rebalance.c | 8 ++++++-- sbin/hammer/cmd_reblock.c | 8 ++++++-- sbin/hammer/cmd_softprune.c | 12 +++++++++--- sbin/hammer/cmd_synctid.c | 10 +++++++--- sbin/hammer/hammer.c | 30 +++++++++++++++++++++++------- 8 files changed, 85 insertions(+), 29 deletions(-) diff --git a/sbin/hammer/cmd_dedup.c b/sbin/hammer/cmd_dedup.c index 39785a8471..1833c8517a 100644 --- a/sbin/hammer/cmd_dedup.c +++ b/sbin/hammer/cmd_dedup.c @@ -200,8 +200,10 @@ hammer_cmd_dedup_simulate(char **av, int ac) { struct sim_dedup_entry *sim_de; - if (ac != 1) + if (ac != 1) { dedup_usage(1); + /* not reached */ + } glob_fd = getpfs(&glob_pfs, av[0]); @@ -263,8 +265,10 @@ hammer_cmd_dedup(char **av, int ac) if (TimeoutOpt > 0) alarm(TimeoutOpt); - if (ac != 1) + if (ac != 1) { dedup_usage(1); + /* not reached */ + } STAILQ_INIT(&pass2_dedup_queue); diff --git a/sbin/hammer/cmd_mirror.c b/sbin/hammer/cmd_mirror.c index 56a61a9223..88f1a09b85 100644 --- a/sbin/hammer/cmd_mirror.c +++ b/sbin/hammer/cmd_mirror.c @@ -110,8 +110,10 @@ hammer_cmd_mirror_read(char **av, int ac, int streaming) uint64_t bwcount; uint64_t estbytes; - if (ac == 0 || ac > 2) + if (ac == 0 || ac > 2) { mirror_usage(1); + /* not reached */ + } filesystem = av[0]; hammer_check_restrict(filesystem); @@ -770,8 +772,10 @@ hammer_cmd_mirror_write(char **av, int ac) int fd; int n; - if (ac != 1) + if (ac != 1) { mirror_usage(1); + /* not reached */ + } filesystem = av[0]; hammer_check_restrict(filesystem); @@ -955,10 +959,12 @@ hammer_cmd_mirror_dump(char **av, int ac) int bytes; int header_only = 0; - if (ac == 1 && strcmp(*av, "header") == 0) + if (ac == 1 && strcmp(*av, "header") == 0) { header_only = 1; - else if (ac != 0) + } else if (ac != 0) { mirror_usage(1); + /* not reached */ + } /* * Read and process the PFS header @@ -1083,8 +1089,10 @@ hammer_cmd_mirror_copy(char **av, int ac, int streaming) char *sh, *user, *host, *rfs; int xac; - if (ac != 2) + if (ac != 2) { mirror_usage(1); + /* not reached */ + } TwoWayPipeOpt = 1; signal(SIGPIPE, SIG_IGN); diff --git a/sbin/hammer/cmd_pfs.c b/sbin/hammer/cmd_pfs.c index 9bd301e9c5..65fc34799b 100644 --- a/sbin/hammer/cmd_pfs.c +++ b/sbin/hammer/cmd_pfs.c @@ -252,8 +252,10 @@ hammer_cmd_pseudofs_create(char **av, int ac, int is_slave) int pfs_id; int fd; - if (ac == 0) + if (ac == 0) { pseudofs_usage(1); + /* not reached */ + } path = av[0]; if (lstat(path, &st) == 0) { errx(1, "Cannot create %s, file exists!", path); @@ -343,8 +345,10 @@ hammer_cmd_pseudofs_destroy(char **av, int ac) int fd; int i; - if (ac == 0) + if (ac == 0) { pseudofs_usage(1); + /* not reached */ + } fd = getpfs(&pfs, av[0]); if (pfs.pfs_id == HAMMER_ROOT_PFSID) { @@ -411,8 +415,10 @@ hammer_cmd_pseudofs_upgrade(char **av, int ac) struct hammer_ioc_pseudofs_rw pfs; int fd; - if (ac == 0) + if (ac == 0) { pseudofs_usage(1); + /* not reached */ + } fd = getpfs(&pfs, av[0]); if (pfs.pfs_id == HAMMER_ROOT_PFSID) { @@ -442,8 +448,10 @@ hammer_cmd_pseudofs_downgrade(char **av, int ac) struct hammer_ioc_pseudofs_rw pfs; int fd; - if (ac == 0) + if (ac == 0) { pseudofs_usage(1); + /* not reached */ + } fd = getpfs(&pfs, av[0]); if (pfs.pfs_id == HAMMER_ROOT_PFSID) { @@ -471,8 +479,10 @@ hammer_cmd_pseudofs_update(char **av, int ac) struct hammer_ioc_pseudofs_rw pfs; int fd; - if (ac == 0) + if (ac == 0) { pseudofs_usage(1); + /* not reached */ + } fd = getpfs(&pfs, av[0]); printf("%s\n", av[0]); diff --git a/sbin/hammer/cmd_rebalance.c b/sbin/hammer/cmd_rebalance.c index 0d66156853..bb3da7932a 100644 --- a/sbin/hammer/cmd_rebalance.c +++ b/sbin/hammer/cmd_rebalance.c @@ -60,15 +60,19 @@ hammer_cmd_rebalance(char **av, int ac) rebal.key_end.obj_id = HAMMER_MAX_OBJID; rebal.allpfs = AllPFS; - if (ac == 0) + if (ac == 0) { rebalance_usage(1); + /* not reached */ + } filesystem = av[0]; if (ac == 1) { perc = 85; } else { perc = strtol(av[1], NULL, 0); - if (perc < 50 || perc > 100) + if (perc < 50 || perc > 100) { rebalance_usage(1); + /* not reached */ + } } rebal.saturation = HAMMER_BTREE_INT_ELMS * perc / 100; diff --git a/sbin/hammer/cmd_reblock.c b/sbin/hammer/cmd_reblock.c index cb54a441be..e5573ead46 100644 --- a/sbin/hammer/cmd_reblock.c +++ b/sbin/hammer/cmd_reblock.c @@ -85,15 +85,19 @@ hammer_cmd_reblock(char **av, int ac, int flags) break; } - if (ac == 0) + if (ac == 0) { reblock_usage(1); + /* not reached */ + } filesystem = av[0]; if (ac == 1) { perc = 100; } else { perc = strtol(av[1], NULL, 0); - if (perc < 0 || perc > 100) + if (perc < 0 || perc > 100) { reblock_usage(1); + /* not reached */ + } } reblock.free_level = (int)((int64_t)perc * HAMMER_BIGBLOCK_SIZE / 100); diff --git a/sbin/hammer/cmd_softprune.c b/sbin/hammer/cmd_softprune.c index 11e49174c1..3ccd9ccc11 100644 --- a/sbin/hammer/cmd_softprune.c +++ b/sbin/hammer/cmd_softprune.c @@ -99,8 +99,10 @@ hammer_cmd_softprune(char **av, int ac, int everything_opt) /* * For now just allow one directory */ - if (ac == 0 || ac > 1) + if (ac == 0 || ac > 1) { softprune_usage(1); + /* not reached */ + } /* * Scan the softlink directory. @@ -110,8 +112,10 @@ hammer_cmd_softprune(char **av, int ac, int everything_opt) scan = hammer_softprune_addentry(&base, &template, *av, NULL, NULL, dummylink, dummylink); - if (scan == NULL) + if (scan == NULL) { softprune_usage(1); + /* not reached */ + } scan->prune.nelms = 0; scan->prune.head.flags |= HAMMER_IOC_PRUNE_ALL; } else { @@ -121,8 +125,10 @@ hammer_cmd_softprune(char **av, int ac, int everything_opt) scan = hammer_softprune_addentry(&base, &template, *av, NULL, NULL, dummylink, dummylink); - if (scan == NULL) + if (scan == NULL) { softprune_usage(1); + /* not reached */ + } scan->prune.nelms = 0; } ++av; diff --git a/sbin/hammer/cmd_synctid.c b/sbin/hammer/cmd_synctid.c index ba5835a35e..e9c433a559 100644 --- a/sbin/hammer/cmd_synctid.c +++ b/sbin/hammer/cmd_synctid.c @@ -51,14 +51,18 @@ hammer_cmd_synctid(char **av, int ac) bzero(&synctid, sizeof(synctid)); synctid.op = HAMMER_SYNCTID_SYNC2; - if (ac == 0 || ac > 2) + if (ac == 0 || ac > 2) { synctid_usage(1); + /* not reached */ + } filesystem = av[0]; if (ac == 2) { - if (strcmp(av[1], "quick") == 0) + if (strcmp(av[1], "quick") == 0) { synctid.op = HAMMER_SYNCTID_SYNC1; - else + } else { synctid_usage(1); + /* not reached */ + } } fd = open(filesystem, O_RDONLY); if (fd < 0) { diff --git a/sbin/hammer/hammer.c b/sbin/hammer/hammer.c index d825a214dc..7e0ed452f4 100644 --- a/sbin/hammer/hammer.c +++ b/sbin/hammer/hammer.c @@ -99,6 +99,7 @@ main(int ac, char **av) break; default: usage(1); + /* not reached */ } break; case 'S': @@ -122,6 +123,7 @@ main(int ac, char **av) break; default: usage(1); + /* not reached */ } break; case 'c': @@ -197,8 +199,10 @@ main(int ac, char **av) BulkOpt = 1; break; case 'C': - if (hammer_parse_cache_size(optarg) == -1) + if (hammer_parse_cache_size(optarg) == -1) { usage(1); + /* not reached */ + } break; case 'F': ForceOpt = 1; @@ -269,8 +273,10 @@ main(int ac, char **av) int len; const char *aname = av[1]; - if (aname == NULL) + if (aname == NULL) { usage(1); + /* not reached */ + } len = strlen(aname); key = (uint32_t)crc32(aname, len) & 0xFFFFFFFEU; @@ -305,8 +311,10 @@ main(int ac, char **av) if (strcmp(av[0], "namekey1") == 0) { int64_t key; - if (av[1] == NULL) + if (av[1] == NULL) { usage(1); + /* not reached */ + } key = (int64_t)(crc32(av[1], strlen(av[1])) & 0x7FFFFFFF) << 32; if (key == 0) key |= 0x100000000LL; @@ -316,8 +324,10 @@ main(int ac, char **av) if (strcmp(av[0], "namekey32") == 0) { int32_t key; - if (av[1] == NULL) + if (av[1] == NULL) { usage(1); + /* not reached */ + } key = crc32(av[1], strlen(av[1])) & 0x7FFFFFFF; if (key == 0) ++key; @@ -381,8 +391,10 @@ main(int ac, char **av) exit(0); } if (strcmp(av[0], "ssh-remote") == 0) { - if (ac != 3) + if (ac != 3) { usage(1); + /* not reached */ + } hammer_cmd_sshremote(av[1], av[2]); exit(0); } @@ -444,8 +456,10 @@ main(int ac, char **av) hammer_cmd_reblock(av + 1, ac - 1, HAMMER_IOC_DO_DIRS); else if (strcmp(av[0], "reblock-data") == 0) hammer_cmd_reblock(av + 1, ac - 1, HAMMER_IOC_DO_DATA); - else + else { usage(1); + /* not reached */ + } exit(0); } if (strncmp(av[0], "mirror", 6) == 0) { @@ -461,8 +475,10 @@ main(int ac, char **av) hammer_cmd_mirror_copy(av + 1, ac - 1, 1); else if (strcmp(av[0], "mirror-dump") == 0) hammer_cmd_mirror_dump(av + 1, ac - 1); - else + else { usage(1); + /* not reached */ + } exit(0); } if (strcmp(av[0], "dedup-simulate") == 0) { -- 2.41.0