From 9930da22423478e7af8fc6461fc059d567ef9543 Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Mon, 17 Apr 2017 14:18:10 +0300 Subject: [PATCH] sbin/*hammer: Add missing braces to conform to code style These were the missing ones due to 1. the code were written by several devs 2. they were missing ever since originally written by dillon@ --- sbin/hammer/cmd_config.c | 5 +++-- sbin/hammer/cmd_dedup.c | 17 +++++++++++------ sbin/hammer/cmd_mirror.c | 3 ++- sbin/hammer/cmd_recover.c | 3 ++- sbin/hammer/cmd_show.c | 15 ++++++++++----- sbin/hammer/ondisk.c | 12 +++++++----- sbin/newfs_hammer/newfs_hammer.c | 3 ++- 7 files changed, 37 insertions(+), 21 deletions(-) diff --git a/sbin/hammer/cmd_config.c b/sbin/hammer/cmd_config.c index e9da04e8ae..18d6e5e0a6 100644 --- a/sbin/hammer/cmd_config.c +++ b/sbin/hammer/cmd_config.c @@ -166,10 +166,11 @@ hammer_cmd_viconfig(char **av, int ac) utimes(path, times); if ((tmp = getenv("EDITOR")) != NULL || - (tmp = getenv("VISUAL")) != NULL) + (tmp = getenv("VISUAL")) != NULL) { editor = strdup(tmp); - else + } else { editor = strdup("vi"); + } asprintf(&runcmd, "%s %s", editor, path); system(runcmd); diff --git a/sbin/hammer/cmd_dedup.c b/sbin/hammer/cmd_dedup.c index 2facd7f68a..da58e315e0 100644 --- a/sbin/hammer/cmd_dedup.c +++ b/sbin/hammer/cmd_dedup.c @@ -284,12 +284,13 @@ hammer_cmd_dedup(char **av, int ac) * the default snapshots directory. */ if (!CyclePath) { - if (glob_pfs.ondisk->snapshots[0] != '/') + if (glob_pfs.ondisk->snapshots[0] != '/') { asprintf(&tmp, "%s/%s/.dedup.cycle", SNAPSHOTS_BASE, av[0]); - else + } else { asprintf(&tmp, "%s/.dedup.cycle", glob_pfs.ondisk->snapshots); + } CyclePath = tmp; needfree = 1; } @@ -756,7 +757,7 @@ crc_failure: goto pass2_insert; sha_de = RB_FIND(sha_dedup_entry_rb_tree, &de->u.fict_root, &temp); - if (sha_de != NULL) + if (sha_de != NULL) { /* There is an entry with this SHA already, but the only * RB-tree element at this point is that entry we just * added. We know for sure these blocks are different @@ -764,6 +765,7 @@ crc_failure: * collision. */ goto sha256_failure; + } sha_de = calloc(1, sizeof(*sha_de)); sha_de->leaf = *scan_leaf; @@ -890,9 +892,10 @@ scan_pfs(char *filesystem, scan_pfs_cb_t func, const char *id) hammer_get_cycle(&mirror.key_beg, &mirror.tid_beg); if (mirror.key_beg.obj_id != (int64_t)HAMMER_MIN_OBJID) { - if (VerboseOpt) + if (VerboseOpt) { fprintf(stderr, "%s: mirror-read: Resuming at object %016jx\n", id, (uintmax_t)mirror.key_beg.obj_id); + } } hammer_key_end_init(&mirror.key_end); @@ -963,13 +966,15 @@ scan_pfs(char *filesystem, scan_pfs_cb_t func, const char *id) } mirror.key_beg = mirror.key_cur; if (DidInterrupt || SigAlrmFlag) { - if (VerboseOpt) + if (VerboseOpt) { fprintf(stderr, "%s\n", (DidInterrupt ? "Interrupted" : "Timeout")); + } hammer_set_cycle(&mirror.key_cur, mirror.tid_beg); - if (VerboseOpt) + if (VerboseOpt) { fprintf(stderr, "Cyclefile %s updated for " "continuation\n", CyclePath); + } exit(1); } if (SigInfoFlag) { diff --git a/sbin/hammer/cmd_mirror.c b/sbin/hammer/cmd_mirror.c index 2562c7c0d1..d7c10d4223 100644 --- a/sbin/hammer/cmd_mirror.c +++ b/sbin/hammer/cmd_mirror.c @@ -539,9 +539,10 @@ generate_histogram(int fd, const char *filesystem, if (*repeatp == 0) { fprintf(stderr, "Prescan to break up bulk transfer"); - if (VerboseOpt > 1) + if (VerboseOpt > 1) { fprintf(stderr, " (%juMB chunks)", (uintmax_t)(SplitupOpt / (1024 * 1024))); + } fprintf(stderr, "\n"); } diff --git a/sbin/hammer/cmd_recover.c b/sbin/hammer/cmd_recover.c index 228ffe2363..c15f518040 100644 --- a/sbin/hammer/cmd_recover.c +++ b/sbin/hammer/cmd_recover.c @@ -545,8 +545,9 @@ recover_elm(hammer_btree_leaf_elm_t leaf) if ((int)nlen < 0) /* illegal length */ break; if (ondisk->entry.obj_id == 0 || - ondisk->entry.obj_id == HAMMER_OBJID_ROOT) + ondisk->entry.obj_id == HAMMER_OBJID_ROOT) { break; + } name = malloc(nlen + 1); bcopy(ondisk->entry.name, name, nlen); name[nlen] = 0; diff --git a/sbin/hammer/cmd_show.c b/sbin/hammer/cmd_show.c index 5d811ca814..b0af9ca583 100644 --- a/sbin/hammer/cmd_show.c +++ b/sbin/hammer/cmd_show.c @@ -419,10 +419,11 @@ print_btree_elm(hammer_node_ondisk_t node, hammer_off_t node_offset, print_bigblock_fill(elm->leaf.data_offset); if (QuietOpt < 2) print_record(elm); - if (opt.stats) + if (opt.stats) { hammer_add_zone_stat(opt.stats, elm->leaf.data_offset, elm->leaf.data_len); + } break; default: printf(" badtype=%d", elm->base.btype); @@ -741,10 +742,12 @@ print_config(char *cfgtxt) printf("\n%s%17s", INDENT, ""); printf("config text=\"\n"); if (cfgtxt != NULL) { - while((token = strsep(&cfgtxt, "\r\n")) != NULL) - if (strlen(token)) + while((token = strsep(&cfgtxt, "\r\n")) != NULL) { + if (strlen(token)) { printf("%s%17s %s\n", INDENT, "", token); + } + } } printf("%s%17s \"", INDENT, ""); } @@ -792,9 +795,10 @@ print_record(hammer_btree_elm_t elm) (uintmax_t)data->inode.ctime, (uintmax_t)data->inode.mtime, (uintmax_t)data->inode.atime); - if (data->inode.ext.symlink[0]) + if (data->inode.ext.symlink[0]) { printf(" symlink=\"%s\"", data->inode.ext.symlink); + } break; case HAMMER_RECTYPE_DIRENTRY: data_len -= HAMMER_ENTRY_NAME_OFF; @@ -802,9 +806,10 @@ print_record(hammer_btree_elm_t elm) printf("dir-entry objid=%016jx lo=%08x", (uintmax_t)data->entry.obj_id, data->entry.localization); - if (!opt.obfuscate) + if (!opt.obfuscate) { printf(" name=\"%*.*s\"", data_len, data_len, data->entry.name); + } break; case HAMMER_RECTYPE_FIX: switch(elm->leaf.base.key) { diff --git a/sbin/hammer/ondisk.c b/sbin/hammer/ondisk.c index bfe679c8e5..a35613b5c2 100644 --- a/sbin/hammer/ondisk.c +++ b/sbin/hammer/ondisk.c @@ -77,9 +77,10 @@ find_buffer(hammer_off_t zone2_offset) assert(volume); hi = buffer_hash(zone2_offset); - TAILQ_FOREACH(buffer, &volume->buffer_lists[hi], entry) + TAILQ_FOREACH(buffer, &volume->buffer_lists[hi], entry) { if (buffer->zone2_offset == zone2_offset) return(buffer); + } return(NULL); } @@ -795,10 +796,9 @@ format_undomap(volume_info_t root_vol, int64_t *undo_buffer_size) while (scan < blockmap->alloc_offset) { hammer_fifo_head_t head; hammer_fifo_tail_t tail; - int isnew; int bytes = HAMMER_UNDO_ALIGN; + int isnew = ((scan & HAMMER_BUFMASK64) == 0); - isnew = ((scan & HAMMER_BUFMASK64) == 0); head = get_buffer_data(scan, &buffer, isnew); buffer->cache.modified = 1; tail = (void *)((char *)head + bytes - sizeof(*tail)); @@ -982,7 +982,8 @@ writehammerbuf(buffer_info_t buffer) HAMMER_BUFSIZE)); } -int64_t init_boot_area_size(int64_t value, off_t avg_vol_size) +int64_t +init_boot_area_size(int64_t value, off_t avg_vol_size) { if (value == 0) { value = HAMMER_BOOT_NOMBYTES; @@ -998,7 +999,8 @@ int64_t init_boot_area_size(int64_t value, off_t avg_vol_size) return(value); } -int64_t init_memory_log_size(int64_t value, off_t avg_vol_size) +int64_t +init_memory_log_size(int64_t value, off_t avg_vol_size) { if (value == 0) { value = HAMMER_MEM_NOMBYTES; diff --git a/sbin/newfs_hammer/newfs_hammer.c b/sbin/newfs_hammer/newfs_hammer.c index bd7c29f1d0..eff34e36de 100644 --- a/sbin/newfs_hammer/newfs_hammer.c +++ b/sbin/newfs_hammer/newfs_hammer.c @@ -272,9 +272,10 @@ print_volume(const volume_info_t volume) printf("%d volume%s total size %s\n", nvols, (nvols == 1 ? "" : "s"), sizetostr(total)); printf("root-volume: %s\n", name); - if (DebugOpt) + if (DebugOpt) { printf("header-junk-size: %s\n", sizetostr(ondisk->vol_bot_beg)); + } printf("boot-area-size: %s\n", sizetostr(ondisk->vol_mem_beg - ondisk->vol_bot_beg)); printf("memory-log-size: %s\n", -- 2.11.4.GIT