]> git.sur5r.net Git - openocd/commitdiff
cfi: tighten up type usage a bit
authorØyvind Harboe <oyvind.harboe@zylin.com>
Fri, 10 Sep 2010 08:20:06 +0000 (10:20 +0200)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Sat, 11 Sep 2010 08:37:32 +0000 (10:37 +0200)
sizeof() is a bit less scary than seing assumption
about size of type, no bug as such.

Use NULL instead of 0 for pointers. More obvious that
it is a pointer from code inspection.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
src/flash/nor/cfi.c

index 9813d83b84721220ec153d5fe2712e83c1940979..5b5b4da9a91c44cf42106ab452a616acf1412e8f 100644 (file)
@@ -805,7 +805,7 @@ FLASH_BANK_COMMAND_HANDLER(cfi_flash_bank_command)
 
        cfi_info = malloc(sizeof(struct cfi_flash_bank));
        cfi_info->probed = 0;
-       cfi_info->erase_region_info = 0;
+       cfi_info->erase_region_info = NULL;
        cfi_info->pri_ext = NULL;
        bank->driver_priv = cfi_info;
 
@@ -2494,7 +2494,8 @@ static int cfi_probe(struct flash_bank *bank)
 
                if (cfi_info->num_erase_regions)
                {
-                       cfi_info->erase_region_info = malloc(4 * cfi_info->num_erase_regions);
+                       cfi_info->erase_region_info = malloc(sizeof(*cfi_info->erase_region_info)
+                                       * cfi_info->num_erase_regions);
                        for (i = 0; i < cfi_info->num_erase_regions; i++)
                        {
                                retval = cfi_query_u32(bank, 0, 0x2d + (4 * i), &cfi_info->erase_region_info[i]);