aboutsummaryrefslogtreecommitdiff
path: root/src/flash/nor/sim3x.c
diff options
context:
space:
mode:
authorPaul Fertser <fercerpav@gmail.com>2015-06-26 09:54:07 +0300
committerSpencer Oliver <spen@spen-soft.co.uk>2015-08-06 13:14:45 +0100
commit169db31ae06627a073c8179dc33d1bce1e88f4d6 (patch)
treedf1deab545355a913f5b6a1e3cf1234e69ccd1e0 /src/flash/nor/sim3x.c
parent733e8ba062de8abc5f4d655d73c2fbd8b51877b2 (diff)
downloadriscv-openocd-169db31ae06627a073c8179dc33d1bce1e88f4d6.zip
riscv-openocd-169db31ae06627a073c8179dc33d1bce1e88f4d6.tar.gz
riscv-openocd-169db31ae06627a073c8179dc33d1bce1e88f4d6.tar.bz2
sim3x: fix build failure with clang 3.6
This fixes a warning as reported by the current clang version: ../../../../src/flash/nor/sim3x.c:867:20: error: address of array 'sim3x_info->device_package' will always evaluate to 'true' . Change-Id: Ie160cbe6df8f491e9beff38d47e2f13575529bf9 Signed-off-by: Paul Fertser <fercerpav@gmail.com> Reviewed-on: http://openocd.zylin.com/2838 Tested-by: jenkins Reviewed-by: Oleksij Rempel Reviewed-by: Andreas Färber <afaerber@suse.de> Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
Diffstat (limited to 'src/flash/nor/sim3x.c')
-rw-r--r--src/flash/nor/sim3x.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/flash/nor/sim3x.c b/src/flash/nor/sim3x.c
index 7ec0076..2a87002 100644
--- a/src/flash/nor/sim3x.c
+++ b/src/flash/nor/sim3x.c
@@ -864,14 +864,12 @@ static int sim3x_flash_info(struct flash_bank *bank, char *buf, int buf_size)
return ERROR_BUF_TOO_SMALL;
/* Package */
- if (sim3x_info->device_package) {
- printed = snprintf(buf, buf_size, "-G%s", sim3x_info->device_package);
- buf += printed;
- buf_size -= printed;
+ printed = snprintf(buf, buf_size, "-G%s", sim3x_info->device_package);
+ buf += printed;
+ buf_size -= printed;
- if (buf_size <= 0)
- return ERROR_BUF_TOO_SMALL;
- }
+ if (buf_size <= 0)
+ return ERROR_BUF_TOO_SMALL;
}
}