blob: aa99735f6ce3ea1c8f4972b919faa0bc9513cf91 [file] [log] [blame]
Brad Bishopd7bf8c12018-02-25 22:55:05 -05001From 8daaa8c27794653d02854c5982669a7638473224 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 16 Jun 2017 23:52:46 -0700
4Subject: [PATCH 2/5] Workaround new warnings generated by GCC 7
5
6src/flash/nor/xmc4xxx.c: In function 'xmc4xxx_get_info_command':
7src/flash/nor/xmc4xxx.c:939:43: error: '%d' directive output may be truncated writing between 1 and 10 bytes into a region of size 6 [-Werror=format-truncation=]
8 snprintf(otp_str, sizeof(otp_str), "- %d\n", i);
9 ^~
10src/flash/nor/xmc4xxx.c:939:40: note: directive argument in the range [0, 2147483647]
11 snprintf(otp_str, sizeof(otp_str), "- %d\n", i);
12 ^~~~~~~~
13src/flash/nor/xmc4xxx.c:939:5: note: 'snprintf' output between 5 and 14 bytes into a destination of size 8
14 snprintf(otp_str, sizeof(otp_str), "- %d\n", i);
15 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16
17Upstream-Status: Pending
18
19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20---
21 src/flash/nor/xmc4xxx.c | 2 +-
22 src/target/arm_adi_v5.c | 2 +-
23 2 files changed, 2 insertions(+), 2 deletions(-)
24
25diff --git a/src/flash/nor/xmc4xxx.c b/src/flash/nor/xmc4xxx.c
26index 02df46a3f..e6c398ff9 100644
27--- a/src/flash/nor/xmc4xxx.c
28+++ b/src/flash/nor/xmc4xxx.c
29@@ -931,7 +931,7 @@ static int xmc4xxx_get_info_command(struct flash_bank *bank, char *buf, int buf_
30
31 /* If OTP Write protection is enabled (User 2), list each
32 * sector that has it enabled */
33- char otp_str[8];
34+ char otp_str[14];
35 if (otp_enabled) {
36 strcat(prot_str, "\nOTP Protection is enabled for sectors:\n");
37 for (int i = 0; i < bank->num_sectors; i++) {
38diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
39index d444db2b1..d0d95121f 100644
40--- a/src/target/arm_adi_v5.c
41+++ b/src/target/arm_adi_v5.c
42@@ -1062,7 +1062,7 @@ static int dap_rom_display(struct command_context *cmd_ctx,
43 int retval;
44 uint64_t pid;
45 uint32_t cid;
46- char tabs[7] = "";
47+ char tabs[16] = "";
48
49 if (depth > 16) {
50 command_print(cmd_ctx, "\tTables too deep");
51--
522.13.1
53