From c97b3b7b634c2818e0a817c86d8981f2daeb8cf9 Mon Sep 17 00:00:00 2001 From: Yann GASCUEL <34003959+lnv42@users.noreply.github.com> Date: Thu, 25 Jan 2024 13:40:36 +0100 Subject: [PATCH] iso15: fix formater issue codeQL reported --- client/src/fileutils.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/src/fileutils.c b/client/src/fileutils.c index ac928ec9a..64a6cf91c 100644 --- a/client/src/fileutils.c +++ b/client/src/fileutils.c @@ -1664,7 +1664,7 @@ int loadFileJSONex(const char *preferredName, void *data, size_t maxdatalen, siz } tag->pagesCount = *datalen / 4; if (tag->pagesCount > ISO15693_TAG_MAX_PAGES) { - PrintAndLogEx(ERR, "loadFileJSONex: maxpagecount=%zu (%04zx) pagecount=%zu (%04zx) -- exceeded maxpagecount" + PrintAndLogEx(ERR, "loadFileJSONex: maxpagecount=%zu (%04zx) pagecount=%u (%04x) -- exceeded maxpagecount" , ISO15693_TAG_MAX_PAGES , ISO15693_TAG_MAX_PAGES , tag->pagesCount @@ -1688,7 +1688,7 @@ int loadFileJSONex(const char *preferredName, void *data, size_t maxdatalen, siz for (uint32_t i = 0; i < (maxdatalen / 4) ; i++) { if (((i + 1) * 4) > ISO15693_TAG_MAX_SIZE) { - PrintAndLogEx(ERR, "loadFileJSONex: maxdatalen=%zu (%04zx) block (i)=%4d (%04x) sptr=%zu (%04zx) -- exceeded maxdatalen" + PrintAndLogEx(ERR, "loadFileJSONex: maxdatalen=%zu (%04zx) block (i)=%4d (%04x) sptr=%u (%04x) -- exceeded maxdatalen" , maxdatalen , maxdatalen , i @@ -1711,7 +1711,7 @@ int loadFileJSONex(const char *preferredName, void *data, size_t maxdatalen, siz tag->pagesCount = sptr / 4; if (tag->pagesCount > ISO15693_TAG_MAX_PAGES) { - PrintAndLogEx(ERR, "loadFileJSONex: maxpagecount=%zu (%04zx) pagecount=%zu (%04zx) -- exceeded maxpagecount" + PrintAndLogEx(ERR, "loadFileJSONex: maxpagecount=%zu (%04zx) pagecount=%u (%04x) -- exceeded maxpagecount" , ISO15693_TAG_MAX_PAGES , ISO15693_TAG_MAX_PAGES , tag->pagesCount @@ -1758,7 +1758,7 @@ int loadFileJSONex(const char *preferredName, void *data, size_t maxdatalen, siz tag->pagesCount = sptr / 8; if (tag->pagesCount > ISO15693_TAG_MAX_PAGES) { - PrintAndLogEx(ERR, "loadFileJSONex: maxpagecount=%zu (%04zx) pagecount=%zu (%04zx) -- exceeded maxpagecount" + PrintAndLogEx(ERR, "loadFileJSONex: maxpagecount=%zu (%04zx) pagecount=%u (%04x) -- exceeded maxpagecount" , ISO15693_TAG_MAX_PAGES , ISO15693_TAG_MAX_PAGES , tag->pagesCount @@ -1786,7 +1786,7 @@ int loadFileJSONex(const char *preferredName, void *data, size_t maxdatalen, siz ((tag->pagesCount * tag->bytesPerPage) > ISO15693_TAG_MAX_SIZE) || (tag->pagesCount == 0) || (tag->bytesPerPage == 0)) { - PrintAndLogEx(ERR, "loadFileJSONex: pagesCount=%zu (%04zx) bytesPerPage=%zu (%04zx) -- invalid tag memory layout" + PrintAndLogEx(ERR, "loadFileJSONex: pagesCount=%u (%04x) bytesPerPage=%u (%04x) -- invalid tag memory layout" , tag->pagesCount , tag->pagesCount , tag->bytesPerPage