From 69100e0e04c16732afcbcce0d494b2b5668d6d8b Mon Sep 17 00:00:00 2001
From: Markus Walter <markus.walter@pg40.com>
Date: Tue, 6 Sep 2022 10:59:43 +0200
Subject: [PATCH] Use printf options to output variable width segments.

---
 client/src/cmdhf15.c | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/client/src/cmdhf15.c b/client/src/cmdhf15.c
index c4a335104..285769f68 100644
--- a/client/src/cmdhf15.c
+++ b/client/src/cmdhf15.c
@@ -1146,26 +1146,16 @@ static int CmdHF15ESave(const char *Cmd) {
 }
 
 static void print_hrule(int blocksize) {
-    PrintAndLogEx(INFO, "-----+" NOLF);
-    for (int i = 0; i < blocksize; i++) {
-        PrintAndLogEx(NORMAL, "---" NOLF);
-    }
-    PrintAndLogEx(NORMAL, "-+-" NOLF);
-    for (int i = 0; i < blocksize; i++) {
-        PrintAndLogEx(NORMAL, "-" NOLF);
-    }
-    PrintAndLogEx(NORMAL, "");
+    char dashes[] = "------------------------------------------------------------";
+    PrintAndLogEx(INFO, "-----+%.*s-+-%.*s-", 3*blocksize, dashes, blocksize, dashes);
 }
 
 static void print_blocks_15693(uint8_t *data, uint16_t bytes, int blocksize) {
     int blocks = bytes / blocksize;
     PrintAndLogEx(NORMAL, "");
     print_hrule(blocksize);
-    PrintAndLogEx(INFO, " blk | data  " NOLF);
-    for (int i = 2; i < blocksize; i++) {
-        PrintAndLogEx(NORMAL, "   " NOLF);
-    }
-    PrintAndLogEx(NORMAL, "| ascii");
+    char spaces[] = "                                                            ";
+    PrintAndLogEx(INFO, " blk | data %.*s| ascii", MAX(0, 3*blocksize - 5), spaces);
     print_hrule(blocksize);
     for (int i = 0; i < blocks; i++) {
         PrintAndLogEx(INFO, "%4d | %s ", i, sprint_hex_ascii(data + (i * blocksize), blocksize));