From f0d589614034326309aa6795b19191960bb4a3a5 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <yobibe@gmail.com>
Date: Wed, 6 Mar 2013 11:02:47 +0100
Subject: [PATCH] Fix cppcheck style: "The scope of the variable can be
 reduced"

---
 libnfc/target-subr.c  | 2 +-
 utils/nfc-mfclassic.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/libnfc/target-subr.c b/libnfc/target-subr.c
index 9b3640f..3765ecb 100644
--- a/libnfc/target-subr.c
+++ b/libnfc/target-subr.c
@@ -496,7 +496,6 @@ sprint_nfc_jewel_info(char *dst, const nfc_jewel_info nji, bool verbose)
 void
 sprint_nfc_iso14443b_info(char *dst, const nfc_iso14443b_info nbi, bool verbose)
 {
-  const int iMaxFrameSizes[] = { 16, 24, 32, 40, 48, 64, 96, 128, 256 };
   dst += sprintf(dst, "               PUPI: ");
   dst += sprint_hex(dst, nbi.abtPupi, 4);
   dst += sprintf(dst, "   Application Data: ");
@@ -533,6 +532,7 @@ sprint_nfc_iso14443b_info(char *dst, const nfc_iso14443b_info nbi, bool verbose)
       dst += sprintf(dst, " * ERROR unknown value\n");
     }
     if ((nbi.abtProtocolInfo[1] & 0xf0) <= 0x80) {
+      const int iMaxFrameSizes[] = { 16, 24, 32, 40, 48, 64, 96, 128, 256 };
       dst += sprintf(dst, "* Maximum frame sizes: %d bytes\n", iMaxFrameSizes[((nbi.abtProtocolInfo[1] & 0xf0) >> 4)]);
     }
     if ((nbi.abtProtocolInfo[1] & 0x0f) == PI_ISO14443_4_SUPPORTED) {
diff --git a/utils/nfc-mfclassic.c b/utils/nfc-mfclassic.c
index a5ebfe4..938aef7 100644
--- a/utils/nfc-mfclassic.c
+++ b/utils/nfc-mfclassic.c
@@ -430,8 +430,6 @@ main(int argc, const char *argv[])
 {
   action_t atAction = ACTION_USAGE;
   uint8_t *pbtUID;
-  FILE   *pfKeys = NULL;
-  FILE   *pfDump = NULL;
   int    unlock = 0;
 
   if (argc < 2) {
@@ -469,7 +467,7 @@ main(int argc, const char *argv[])
     exit(EXIT_FAILURE);
   }
   if (bUseKeyFile) {
-    pfKeys = fopen(argv[4], "rb");
+    FILE *pfKeys = fopen(argv[4], "rb");
     if (pfKeys == NULL) {
       printf("Could not open keys file: %s\n", argv[4]);
       exit(EXIT_FAILURE);
@@ -485,11 +483,12 @@ main(int argc, const char *argv[])
   if (atAction == ACTION_READ) {
     memset(&mtDump, 0x00, sizeof(mtDump));
   } else {
-    pfDump = fopen(argv[3], "rb");
+    FILE *pfDump = fopen(argv[3], "rb");
 
     if (pfDump == NULL) {
       printf("Could not open dump file: %s\n", argv[3]);
       exit(EXIT_FAILURE);
+
     }
 
     if (fread(&mtDump, 1, sizeof(mtDump), pfDump) != sizeof(mtDump)) {
@@ -578,7 +577,7 @@ main(int argc, const char *argv[])
     if (read_card(unlock)) {
       printf("Writing data to file: %s ...", argv[3]);
       fflush(stdout);
-      pfDump = fopen(argv[3], "wb");
+      FILE *pfDump = fopen(argv[3], "wb");
       if (pfDump == NULL) {
         printf("Could not open dump file: %s\n", argv[3]);
         nfc_close(pnd);