From 26c28c188a9e3c04bd004e09c1439c8e6a25d170 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 18 Apr 2020 18:20:19 +0200
Subject: [PATCH] minor

---
 client/Makefile             |  2 ++
 client/src/emv/emvjson.c    |  4 ++--
 client/src/fido/cbortools.c | 10 +++++-----
 client/src/mifare/mad.c     |  4 ++--
 client/src/mifare/mifare4.c |  2 +-
 client/src/mifare/ndef.c    |  4 ++--
 client/src/util.c           |  2 +-
 7 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/client/Makefile b/client/Makefile
index 892feadf7..ebc7f3676 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -54,6 +54,8 @@ INCLUDES_CLIENT = -I./src -I./deps -I../include -I../common -I./deps/cliparser -
 CFLAGS ?= -Wall -Werror -O3
 # We cannot just use CFLAGS+=... because it has impact on sub-makes if CFLAGS is defined in env:
 PM3CFLAGS = $(CFLAGS) -std=c99 -D_ISOC99_SOURCE $(INCLUDES_CLIENT)
+# WIP Testing
+#PM3CFLAGS = $(CFLAGS) -std=c11 -pedantic $(INCLUDES_CLIENT)
 PREFIX ?= /usr/local
 ifneq (,$(findstring MINGW,$(platform)))
     PM3CFLAGS += -mno-ms-bitfields -fexec-charset=cp850
diff --git a/client/src/emv/emvjson.c b/client/src/emv/emvjson.c
index 968b51d51..ebf42704f 100644
--- a/client/src/emv/emvjson.c
+++ b/client/src/emv/emvjson.c
@@ -92,7 +92,7 @@ int JsonSaveInt(json_t *root, const char *path, int value) {
 
 int JsonSaveStr(json_t *root, const char *path, const char *value) {
     return JsonSaveJsonObject(root, path, json_string(value));
-};
+}
 
 int JsonSaveBoolean(json_t *root, const char *path, bool value) {
     return JsonSaveJsonObject(root, path, json_boolean(value));
@@ -298,7 +298,7 @@ int JsonLoadBufAsHex(json_t *elm, const char *path, uint8_t *data, size_t maxbuf
         return 2;
 
     return 0;
-};
+}
 
 bool ParamLoadFromJson(struct tlvdb *tlv) {
     json_t *root;
diff --git a/client/src/fido/cbortools.c b/client/src/fido/cbortools.c
index 911244806..d58b11145 100644
--- a/client/src/fido/cbortools.c
+++ b/client/src/fido/cbortools.c
@@ -387,7 +387,7 @@ CborError CborGetArrayBinStringValueEx(CborValue *elm, uint8_t *data, size_t max
         *datalen = totallen;
 
     return CborNoError;
-};
+}
 
 CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen, size_t *datalen) {
     if (datalen)
@@ -402,7 +402,7 @@ CborError CborGetBinStringValue(CborValue *elm, uint8_t *data, size_t maxdatalen
         *datalen = slen;
 
     return CborNoError;
-};
+}
 
 CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen, char *delimiter) {
     CborValue array;
@@ -435,7 +435,7 @@ CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxdatalen,
         *datalen = totallen;
 
     return CborNoError;
-};
+}
 
 CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen) {
     if (datalen)
@@ -450,14 +450,14 @@ CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size
         *datalen = slen;
 
     return CborNoError;
-};
+}
 
 CborError CborGetStringValueBuf(CborValue *elm) {
     static char stringBuf[2048];
     memset(stringBuf, 0x00, sizeof(stringBuf));
 
     return CborGetStringValue(elm, stringBuf, sizeof(stringBuf), NULL);
-};
+}
 
 int CBOREncodeElm(json_t *root, const char *rootElmId, CborEncoder *encoder) {
     json_t *elm = NULL;
diff --git a/client/src/mifare/mad.c b/client/src/mifare/mad.c
index fe41ac032..ffacba3a7 100644
--- a/client/src/mifare/mad.c
+++ b/client/src/mifare/mad.c
@@ -236,7 +236,7 @@ int MAD1DecodeAndPrint(uint8_t *sector, bool verbose, bool *haveMAD2) {
     };
 
     return 0;
-};
+}
 
 int MAD2DecodeAndPrint(uint8_t *sector, bool verbose) {
     PrintAndLogEx(NORMAL, "16 MAD2");
@@ -255,4 +255,4 @@ int MAD2DecodeAndPrint(uint8_t *sector, bool verbose) {
     };
 
     return 0;
-};
+}
diff --git a/client/src/mifare/mifare4.c b/client/src/mifare/mifare4.c
index 67c6f3932..09f10d321 100644
--- a/client/src/mifare/mifare4.c
+++ b/client/src/mifare/mifare4.c
@@ -88,7 +88,7 @@ const char *mfGetAccessConditionsDesc(uint8_t blockn, uint8_t *data) {
     };
 
     return StaticNone;
-};
+}
 /*
 static int CalculateEncIVCommand(mf4Session_t *session, uint8_t *iv, bool verbose) {
     memcpy(&iv[0], &session->TI, 4);
diff --git a/client/src/mifare/ndef.c b/client/src/mifare/ndef.c
index 990221c5c..45ad2e081 100644
--- a/client/src/mifare/ndef.c
+++ b/client/src/mifare/ndef.c
@@ -219,7 +219,7 @@ static int ndefDecodeSig1(uint8_t *sig, size_t siglen) {
     }
 
     return PM3_SUCCESS;
-};
+}
 
 // https://github.com/nfcpy/ndeflib/blob/master/src/ndef/signature.py#L292
 static int ndefDecodeSig2(uint8_t *sig, size_t siglen) {
@@ -283,7 +283,7 @@ static int ndefDecodeSig2(uint8_t *sig, size_t siglen) {
     }
 
     return PM3_SUCCESS;
-};
+}
 
 static int ndefDecodeSig(uint8_t *sig, size_t siglen) {
     PrintAndLogEx(SUCCESS, "\tsignature version : \t" _GREEN_("0x%02x"), sig[0]);
diff --git a/client/src/util.c b/client/src/util.c
index 654a87cc3..3d0c6bd87 100644
--- a/client/src/util.c
+++ b/client/src/util.c
@@ -941,7 +941,7 @@ char *str_ndup(const char *src, size_t len) {
  * Returns the number of nibbles (4 bits) entered.
  */
 int hexstring_to_u96(uint32_t *hi2, uint32_t *hi, uint32_t *lo, const char *str) {
-    int n = 0, i = 0;
+    unsigned int n = 0, i = 0;
 
     while (sscanf(&str[i++], "%1x", &n) == 1) {
         *hi2 = (*hi2 << 4) | (*hi >> 28);