From 6364009e457557817f449e3dd396c6299c2ac5e8 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Tue, 29 Apr 2025 14:07:32 -0400 Subject: [PATCH] Event History Setup; #287 Fix -Wformat-overflow warning regarding writing imported names into a char array; --- src/dsd_ncurses.c | 8 ++++---- src/nxdn_element.c | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c index 0a0e63b..688751b 100644 --- a/src/dsd_ncurses.c +++ b/src/dsd_ncurses.c @@ -5090,14 +5090,14 @@ void watchdog_event_current (dsd_opts * opts, dsd_state * state, uint8_t slot) if (t_name_loaded) { - char group[400]; - sprintf (group, "T Name: %s; Mode: %s; ", t_name, t_mode); + char group[420]; + sprintf (group, "TName: %s; Mode: %s; ", t_name, t_mode); strcat (event_string, group); } if (s_name_loaded) { - char private[400]; - sprintf (private, "S Name: %s; Mode: %s; ", s_name, s_mode); + char private[420]; + sprintf (private, "SName: %s; Mode: %s; ", s_name, s_mode); strcat (event_string, private); } diff --git a/src/nxdn_element.c b/src/nxdn_element.c index fe505a8..c116f95 100644 --- a/src/nxdn_element.c +++ b/src/nxdn_element.c @@ -745,9 +745,11 @@ void NXDN_decode_Alias(dsd_opts * opts, dsd_state * state, uint8_t * Message) char str_a[120]; char str_b[50]; + //TODO: Revisit the debug here and see if anythign comes out of it, + //maybe go on the assumptiont his works very similar to DMR talker alias //debug/test - // fprintf (stderr, " U1: %02X U2: %02X;", unk1, unk2); - // fprintf (stderr, " A:%d/%d; ", blocknumber, total); + // fprintf (stderr, " U1: %02X U2: %02X;", unk1, unk2); //these always appear to be the same two byte values, even across different systems and languages + // fprintf (stderr, " A:%d/%d; ", blocknumber, total); //this is accurate info here //sanity check to prevent OOB array assignment if (blocknumber > 0 && blocknumber < 4) //last 'block' may have been assigning garbage name values -- I'm honestly not sure block'4' contains Alias data, but other data or something