jtagspi: fix build on MacOS

[openocd.git] / src / flash / nor / sfdp.c

diff --git a/src/flash/nor/sfdp.c b/src/flash/nor/sfdp.c
index 2fbc37d1fcb80ea67300e7f3f0cb49c91828544a..88d3b96f43316b328078872b3c4c8d51f1986e45 100644 (file)
--- a/src/flash/nor/sfdp.c
+++ b/src/flash/nor/sfdp.c
@@ -90,8 +90,8 @@ int spi_sfdp(struct flash_bank *bank, struct flash_device *dev,
                return ERROR_FLASH_BANK_NOT_PROBED;
        }
        if (((header.revision >> 24) & 0xFF) != SFDP_ACCESS_PROT) {
-               LOG_ERROR("access protocol 0x%02" PRIx8 " not implemented",
-                       (header.revision >> 24) & 0xFF);
+               LOG_ERROR("access protocol 0x%02x not implemented",
+                       (header.revision >> 24) & 0xFFU);
                return ERROR_FLASH_BANK_NOT_PROBED;
        }
 
@@ -99,7 +99,7 @@ int spi_sfdp(struct flash_bank *bank, struct flash_device *dev,
        nph = ((header.revision >> 16) & 0xFF) + 1;
        LOG_DEBUG("parameter headers: %d", nph);
        pheaders = malloc(sizeof(struct sfdp_phdr) * nph);
-       if (pheaders == NULL) {
+       if (!pheaders) {
                LOG_ERROR("not enough memory");
                return ERROR_FAIL;
        }
@@ -119,7 +119,7 @@ int spi_sfdp(struct flash_bank *bank, struct flash_device *dev,
 
                /* retrieve parameter table */
                ptable = malloc(words << 2);
-               if (ptable == NULL) {
+               if (!ptable) {
                        LOG_ERROR("not enough memory");
                        retval = ERROR_FAIL;
                        goto err;