Align benchmark output even for longer cipher names.

This commit is contained in:
Milan Broz
2017-04-26 14:32:54 +02:00
parent 1691282314
commit 8df2a598a7

View File

@@ -613,8 +613,8 @@ static int action_benchmark(void)
key_size / 8, iv_size, key_size / 8, iv_size,
&enc_mbr, &dec_mbr); &enc_mbr, &dec_mbr);
if (!r) { if (!r) {
log_std(N_("# Algorithm | Key | Encryption | Decryption\n")); log_std(N_("# Algorithm | Key | Encryption | Decryption\n"));
log_std("%8s-%s %4db %6.1f MiB/s %6.1f MiB/s\n", log_std("%11s-%s %4db %6.1f MiB/s %6.1f MiB/s\n",
cipher, cipher_mode, key_size, enc_mbr, dec_mbr); cipher, cipher_mode, key_size, enc_mbr, dec_mbr);
} else if (r == -ENOENT) } else if (r == -ENOENT)
log_err(_("Cipher %s is not available.\n"), opt_cipher); log_err(_("Cipher %s is not available.\n"), opt_cipher);
@@ -635,15 +635,15 @@ static int action_benchmark(void)
if (r == -ENOENT) if (r == -ENOENT)
skipped++; skipped++;
if (i == 0) if (i == 0)
log_std(N_("# Algorithm | Key | Encryption | Decryption\n")); log_std(N_("# Algorithm | Key | Encryption | Decryption\n"));
snprintf(cipher, MAX_CIPHER_LEN, "%s-%s", snprintf(cipher, MAX_CIPHER_LEN, "%s-%s",
bciphers[i].cipher, bciphers[i].mode); bciphers[i].cipher, bciphers[i].mode);
if (!r) if (!r)
log_std("%12s %4zub %6.1f MiB/s %6.1f MiB/s\n", log_std("%15s %4zub %6.1f MiB/s %6.1f MiB/s\n",
cipher, bciphers[i].key_size*8, enc_mbr, dec_mbr); cipher, bciphers[i].key_size*8, enc_mbr, dec_mbr);
else else
log_std("%12s %4zub %13s %13s\n", cipher, log_std("%15s %4zub %13s %13s\n", cipher,
bciphers[i].key_size*8, _("N/A"), _("N/A")); bciphers[i].key_size*8, _("N/A"), _("N/A"));
} }
if (skipped && skipped == i) if (skipped && skipped == i)