From 12f94a921a75439e85c5c29e540fb3b75b981caa Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Mon, 24 Mar 2025 09:13:21 +0100
Subject: [PATCH] text and cpp warning for hitagu fix suggested by jump

---
 armsrc/epa.c             |  2 +-
 client/src/cmdflashmem.c | 12 ++++++++----
 client/src/cmdhf14a.c    |  5 +++--
 client/src/cmdhfmf.c     |  1 -
 client/src/cmdlfem410x.c |  3 +--
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/armsrc/epa.c b/armsrc/epa.c
index aa0f87230..583b59d8f 100644
--- a/armsrc/epa.c
+++ b/armsrc/epa.c
@@ -649,5 +649,5 @@ void EPA_PACE_Simulate(const PacketCommandNG *c) {
 
     Dbprintf("Standardized Domain Parameter: %i", pace_version_info.parameter_id);
     DbpString("");
-    DbpString("finished");
+    DbpString("Done!");
 }
diff --git a/client/src/cmdflashmem.c b/client/src/cmdflashmem.c
index f2237cf2a..33b821eca 100644
--- a/client/src/cmdflashmem.c
+++ b/client/src/cmdflashmem.c
@@ -247,7 +247,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
     uint8_t *data = calloc(FLASH_MEM_MAX_SIZE_P(spi_flash_pages), sizeof(uint8_t));
 
     switch (d) {
-        case DICTIONARY_MIFARE:
+        case DICTIONARY_MIFARE: {
             keylen = MF_KEY_LENGTH;
             res = loadFileDICTIONARY(filename, data, &datalen, keylen, &keycount);
             if (res || !keycount) {
@@ -261,7 +261,8 @@ static int CmdFlashMemLoad(const char *Cmd) {
             }
             strcpy(spiffsDest, MF_KEYS_FILE);
             break;
-        case DICTIONARY_T55XX:
+        }
+        case DICTIONARY_T55XX: {
             keylen = T55XX_KEY_LENGTH;
             res = loadFileDICTIONARY(filename, data, &datalen, keylen, &keycount);
             if (res || !keycount) {
@@ -275,7 +276,8 @@ static int CmdFlashMemLoad(const char *Cmd) {
             }
             strcpy(spiffsDest, T55XX_KEYS_FILE);
             break;
-        case DICTIONARY_ICLASS:
+        }
+        case DICTIONARY_ICLASS: {
             keylen = ICLASS_KEY_LENGTH;
             res = loadFileDICTIONARY(filename, data, &datalen, keylen, &keycount);
             if (res || !keycount) {
@@ -289,7 +291,8 @@ static int CmdFlashMemLoad(const char *Cmd) {
             }
             strcpy(spiffsDest, ICLASS_KEYS_FILE);
             break;
-        case DICTIONARY_NONE:
+        }
+        case DICTIONARY_NONE: {
             res = loadFile_safe(filename, ".bin", (void **)&data, &datalen);
             if (res != PM3_SUCCESS) {
                 free(data);
@@ -302,6 +305,7 @@ static int CmdFlashMemLoad(const char *Cmd) {
                 return PM3_EOVFLOW;
             }
             break;
+        }
     }
 
     // ICEMAN: not needed when we transite to loadxxxx_safe methods
diff --git a/client/src/cmdhf14a.c b/client/src/cmdhf14a.c
index bd34c3fbb..d9dca4450 100644
--- a/client/src/cmdhf14a.c
+++ b/client/src/cmdhf14a.c
@@ -3330,6 +3330,7 @@ int CmdHF14ANdefRead(const char *Cmd) {
     }
 
     free(ndef_file);
+    PrintAndLogEx(NORMAL, "");
     return PM3_SUCCESS;
 }
 
@@ -3589,8 +3590,8 @@ int CmdHF14ANdefFormat(const char *Cmd) {
         DropField();
     }
 
+    PrintAndLogEx(INFO, "Done!");
     PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(INFO, "finished");
     return PM3_SUCCESS;
 }
 
@@ -3742,8 +3743,8 @@ int CmdHF14ANdefWrite(const char *Cmd) {
         PrintAndLogEx(INFO, "Write data file %02x " _GREEN_("success"), fnum);
     }
 
+    PrintAndLogEx(INFO, "Done!");
     PrintAndLogEx(NORMAL, "");
-    PrintAndLogEx(INFO, "finished");
     return PM3_SUCCESS;
 }
 
diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c
index a1835ada8..aae37bf78 100644
--- a/client/src/cmdhfmf.c
+++ b/client/src/cmdhfmf.c
@@ -2539,7 +2539,6 @@ static int CmdHF14AMfAutoPWN(const char *Cmd) {
     char outfilename[FILE_PATH_SIZE] = {0};
     CLIParamStrToBuf(arg_get_str(ctx, 6), (uint8_t *)outfilename, FILE_PATH_SIZE, &outfnlen);
 
-
     bool slow = arg_get_lit(ctx, 7);
     bool legacy_mfchk = arg_get_lit(ctx, 8);
     bool verbose = arg_get_lit(ctx, 9);
diff --git a/client/src/cmdlfem410x.c b/client/src/cmdlfem410x.c
index 23824426b..1b4f31d95 100644
--- a/client/src/cmdlfem410x.c
+++ b/client/src/cmdlfem410x.c
@@ -741,8 +741,7 @@ static int CmdEM410xClone(const char *Cmd) {
                         }
                     }
                     //TODO: keep other fields?
-                    memcpy(packet.data, &config_page, sizeof(config_page));
-                    // PrintAndLogEx(INFO, "packet.data: %s", sprint_hex(packet.data, sizeof(packet.data)));
+                    memcpy(packet.data, &config_page.asBytes, sizeof(config_page.asBytes));
                     packet.page = 1;
                     break;
                 }