From f3046b4053e82c3ab765e4bb7bf6e9a990cb20ea Mon Sep 17 00:00:00 2001 From: Andrea Mazzoleni Date: Sat, 16 Jan 2016 07:56:52 +0100 Subject: [PATCH] Fix some misuses of MiB and MB --- cmdline/speed.c | 2 +- cmdline/state.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmdline/speed.c b/cmdline/speed.c index eb75d7ec..dcdf83df 100644 --- a/cmdline/speed.c +++ b/cmdline/speed.c @@ -162,7 +162,7 @@ void speed(int period) printf("Speed test using %u data buffers of %u bytes, for a total of %u KiB.\n", nd, size, nd * size / 1024); printf("Memory blocks have a displacement of %u bytes to improve cache performance.\n", RAID_MALLOC_DISPLACEMENT); - printf("The reported values are the aggregate bandwidth of all data blocks in MiB/s,\n"); + printf("The reported values are the aggregate bandwidth of all data blocks in MB/s,\n"); printf("not counting parity blocks.\n"); printf("\n"); diff --git a/cmdline/state.c b/cmdline/state.c index a140d122..6f125921 100644 --- a/cmdline/state.c +++ b/cmdline/state.c @@ -3956,7 +3956,7 @@ int state_progress(struct snapraid_state* state, block_off_t blockpos, block_off delta_tick_total = tick_total - state->progress_tick_total[oldest]; delta_tick_cpu = tick_cpu - state->progress_tick_cpu[oldest]; - /* estimate the speed in MiB/s */ + /* estimate the speed in MB/s */ if (delta_time != 0) out_speed = (unsigned)(delta_size / MEGA / delta_time); @@ -3973,9 +3973,9 @@ int state_progress(struct snapraid_state* state, block_off_t blockpos, block_off log_tag("run:pos:%u:%u:%" PRIu64 ":%u:%u:%u:%u:%" PRIu64 "\n", blockpos, countpos, countsize, out_perc, out_eta, out_speed, out_cpu, (uint64_t)elapsed); log_flush(); } else { - msg_bar("%u%%, %u MiB", out_perc, (unsigned)(countsize / MEGA)); + msg_bar("%u%%, %u MB", out_perc, (unsigned)(countsize / MEGA)); if (out_speed) - msg_bar(", %u MiB/s", out_speed); + msg_bar(", %u MB/s", out_speed); if (out_cpu) msg_bar(", CPU %u%%", out_cpu); if (out_eta)