target,flash: allow target_free_working_area on NULL area pointer

[fw/openocd] / src / flash / nor / lpcspifi.c

diff --git a/src/flash/nor/lpcspifi.c b/src/flash/nor/lpcspifi.c
index dd1c63d747cd1a3a8f66ea9ec8f0d54dfe3a30ec..160e2dc6746c27bcd2106fd16d5b3614c448e3d2 100644 (file)
--- a/src/flash/nor/lpcspifi.c
+++ b/src/flash/nor/lpcspifi.c
@@ -66,7 +66,7 @@ FLASH_BANK_COMMAND_HANDLER(lpcspifi_flash_bank_command)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
        lpcspifi_info = malloc(sizeof(struct lpcspifi_flash_bank));
-       if (lpcspifi_info == NULL) {
+       if (!lpcspifi_info) {
                LOG_ERROR("not enough memory");
                return ERROR_FAIL;
        }
@@ -894,7 +894,7 @@ static int lpcspifi_probe(struct flash_bank *bank)
        /* create and fill sectors array */
        bank->num_sectors = lpcspifi_info->dev->size_in_bytes / sectorsize;
        sectors = malloc(sizeof(struct flash_sector) * bank->num_sectors);
-       if (sectors == NULL) {
+       if (!sectors) {
                LOG_ERROR("not enough memory");
                return ERROR_FAIL;
        }
@@ -926,17 +926,16 @@ static int lpcspifi_protect_check(struct flash_bank *bank)
        return ERROR_OK;
 }
 
-static int get_lpcspifi_info(struct flash_bank *bank, char *buf, int buf_size)
+static int get_lpcspifi_info(struct flash_bank *bank, struct command_invocation *cmd)
 {
        struct lpcspifi_flash_bank *lpcspifi_info = bank->driver_priv;
 
        if (!(lpcspifi_info->probed)) {
-               snprintf(buf, buf_size,
-                       "\nSPIFI flash bank not probed yet\n");
+               command_print_sameline(cmd, "\nSPIFI flash bank not probed yet\n");
                return ERROR_OK;
        }
 
-       snprintf(buf, buf_size, "\nSPIFI flash information:\n"
+       command_print_sameline(cmd, "\nSPIFI flash information:\n"
                "  Device \'%s\' (ID 0x%08" PRIx32 ")\n",
                lpcspifi_info->dev->name, lpcspifi_info->dev->device_id);