Update copy function from PR comments

Replace spaces by tabs
Invert src and dst in copy functions

Signed-off-by: Stany MARCEL <[email protected]>

Author: ynsta

amiibo.c

@@ -158,23 +158,22 @@ bool nfc3d_amiibo_load_keys(nfc3d_amiibo_keys * amiiboKeys, const char * path) {
 }
 
 
-void nfc3d_amiibo_copy_app_data(uint8_t * dst, const uint8_t * src) {
-
-    uint16_t *ami_nb_wr = (uint16_t*)(dst + 0x29);
-    uint16_t *cfg_nb_wr = (uint16_t*)(dst + 0xB4);
-
-    /* increment write counters */
-    *ami_nb_wr = htobe16(be16toh(*ami_nb_wr) + 1);
-    *cfg_nb_wr = htobe16(be16toh(*cfg_nb_wr) + 1);
-
-    /* copy flags */
-    dst[0x2C] = src[0x2C];
-    /* copy programID */
-    memcpy(dst + 0xAC, src + 0xAC, 8);
-    /* copy AppID */
-    memcpy(dst + 0xB6, src + 0xB6, 4);
-
-    /* copy AppData */
-    memcpy(dst + 0xDC, src + 0xDC, 216);
-
+void nfc3d_amiibo_copy_app_data(const uint8_t * src, uint8_t * dst) {
+
+	uint16_t *ami_nb_wr = (uint16_t*)(dst + 0x29);
+	uint16_t *cfg_nb_wr = (uint16_t*)(dst + 0xB4);
+
+	/* increment write counters */
+	*ami_nb_wr = htobe16(be16toh(*ami_nb_wr) + 1);
+	*cfg_nb_wr = htobe16(be16toh(*cfg_nb_wr) + 1);
+
+	/* copy flags */
+	dst[0x2C] = src[0x2C];
+	/* copy programID */
+	memcpy(dst + 0xAC, src + 0xAC, 8);
+	/* copy AppID */
+	memcpy(dst + 0xB6, src + 0xB6, 4);
+	/* copy AppData */
+	memcpy(dst + 0xDC, src + 0xDC, 216);
 }
+

amiitool.c

@@ -39,7 +39,7 @@ int main(int argc, char ** argv) {
 	self = argv[0];
 
 	char * infile = NULL;
-        char * savefile = NULL;
+	char * savefile = NULL;
 	char * outfile = NULL;
 	char * keyfile = NULL;
 	char op = '\0';
@@ -144,7 +144,7 @@ int main(int argc, char ** argv) {
 			}
 		}
 
-		nfc3d_amiibo_copy_app_data(plain_base, plain_save);
+		nfc3d_amiibo_copy_app_data(plain_save, plain_base);
 		nfc3d_amiibo_pack(&amiiboKeys, plain_base, modified);
 	}
 
@@ -169,4 +169,4 @@ int main(int argc, char ** argv) {
 	fclose(f);
 
 	return 0;
-}
+}

include/nfc3d/amiibo.h

@@ -24,6 +24,6 @@ typedef struct {
 bool nfc3d_amiibo_unpack(const nfc3d_amiibo_keys * amiiboKeys, const uint8_t * tag, uint8_t * plain);
 void nfc3d_amiibo_pack(const nfc3d_amiibo_keys * amiiboKeys, const uint8_t * plain, uint8_t * tag);
 bool nfc3d_amiibo_load_keys(nfc3d_amiibo_keys * amiiboKeys, const char * path);
-void nfc3d_amiibo_copy_app_data(uint8_t * dst, const uint8_t * src);
+void nfc3d_amiibo_copy_app_data(const uint8_t * src, uint8_t * dst);
 
 #endif