80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #3550 from cold-brewed/postcard-warnings

Browse Source 
postcard: Clean up some gcc warnings
This commit is contained in:
Miran Grča
2023-08-12 19:02:06 +02:00
committed by GitHub
parent 3b95bde764 687439decc
commit dab0a1258d
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/device/postcard.c
View File

@@ -37,7 +37,7 @@ static uint8_t postcard_written[POSTCARDS_NUM];
static uint8_t postcard_ports_num = 1; static uint8_t postcard_ports_num = 1;
static uint8_t postcard_codes[POSTCARDS_NUM]; static uint8_t postcard_codes[POSTCARDS_NUM];
static uint8_t postcard_prev_codes[POSTCARDS_NUM]; static uint8_t postcard_prev_codes[POSTCARDS_NUM];
#define UISTR_LEN 13 #define UISTR_LEN 32
static char postcard_str[UISTR_LEN]; /* UI output string */ static char postcard_str[UISTR_LEN]; /* UI output string */
extern void ui_sb_bugui(char *__str); extern void ui_sb_bugui(char *__str);
@@ -66,44 +66,44 @@ static void
postcard_setui(void) postcard_setui(void)
{ {
if (postcard_ports_num > 1) { if (postcard_ports_num > 1) {
char ps[2][POSTCARDS_NUM][64] = { { 0 }, char ps[2][POSTCARDS_NUM][3] = { { 0 },
{ 0 } }; { 0 } };
for (uint8_t i = 0; i < POSTCARDS_NUM; i++) { for (uint8_t i = 0; i < POSTCARDS_NUM; i++) {
if (!postcard_written[i]) { if (!postcard_written[i]) {
sprintf(ps[0][i], "--"); snprintf(ps[0][i], sizeof(ps[0][i]), "--");
sprintf(ps[1][i], "--"); snprintf(ps[1][i], sizeof(ps[1][i]), "--");
} else if (postcard_written[i] == 1) { } else if (postcard_written[i] == 1) {
sprintf(ps[0][i], "%02X", postcard_codes[i]); snprintf(ps[0][i], sizeof(ps[0][i]), "%02X", postcard_codes[i]);
sprintf(ps[1][i], "--"); snprintf(ps[1][i], sizeof(ps[1][i]), "--");
} else { } else {
sprintf(ps[0][i], "%02X", postcard_codes[i]); snprintf(ps[0][i], sizeof(ps[0][i]), "%02X", postcard_codes[i]);
sprintf(ps[1][i], "%02X", postcard_prev_codes[i]); snprintf(ps[1][i], sizeof(ps[1][i]), "%02X", postcard_prev_codes[i]);
} }
} }
switch (postcard_ports_num) { switch (postcard_ports_num) {
default: default:
case 2: case 2:
sprintf(postcard_str, "POST: %s%s %s%s", snprintf(postcard_str, sizeof(postcard_str), "POST: %s%s %s%s",
ps[0][0], ps[0][1], ps[1][0], ps[1][1]); ps[0][0], ps[0][1], ps[1][0], ps[1][1]);
break; break;
case 3: case 3:
sprintf(postcard_str, "POST: %s/%s%s %s/%s%s", snprintf(postcard_str, sizeof(postcard_str), "POST: %s/%s%s %s/%s%s",
ps[0][0], ps[0][1], ps[0][2], ps[1][0], ps[1][1], ps[1][2]); ps[0][0], ps[0][1], ps[0][2], ps[1][0], ps[1][1], ps[1][2]);
break; break;
case 4: case 4:
sprintf(postcard_str, "POST: %s%s/%s%s %s%s/%s%s", snprintf(postcard_str, sizeof(postcard_str), "POST: %s%s/%s%s %s%s/%s%s",
ps[0][0], ps[0][1], ps[0][2], ps[0][3], ps[0][0], ps[0][1], ps[0][2], ps[0][3],
ps[1][0], ps[1][1], ps[1][2], ps[1][3]); ps[1][0], ps[1][1], ps[1][2], ps[1][3]);
break; break;
} }
} else { } else {
if (!postcard_written[0]) if (!postcard_written[0])
sprintf(postcard_str, "POST: -- --"); snprintf(postcard_str, sizeof(postcard_str), "POST: -- --");
else if (postcard_written[0] == 1) else if (postcard_written[0] == 1)
sprintf(postcard_str, "POST: %02X --", postcard_codes[0]); snprintf(postcard_str, sizeof(postcard_str), "POST: %02X --", postcard_codes[0]);
else else
sprintf(postcard_str, "POST: %02X %02X", postcard_codes[0], postcard_prev_codes[0]); snprintf(postcard_str, sizeof(postcard_str), "POST: %02X %02X", postcard_codes[0], postcard_prev_codes[0]);
} }
ui_sb_bugui(postcard_str); ui_sb_bugui(postcard_str);