lint(gps,tests): fix strict preflight regressions in unpushed NXDN/DMR changes

Author: arancormonk

src/core/gps/dsd_gps.c

@@ -1053,14 +1053,14 @@ nxdn_gps_report(dsd_opts* opts, dsd_state* state, uint8_t* input, uint32_t src)
     uint16_t lon_frac = (uint16_t)convert_bits_into_output(input + 16, 15);
     uint8_t lon_hem = (uint8_t)convert_bits_into_output(input + 183, 1);
     double lon_minutes = (double)(lon_degmin % 100U) + ((double)lon_frac / 10000.0);
-    double lon_decimal = (double)(lon_degmin / 100U) + (lon_minutes / 60.0);
+    double lon_decimal = ((double)lon_degmin / 100.0) + (lon_minutes / 60.0);
     double longitude = (lon_hem == 0U) ? lon_decimal : -lon_decimal;
 
     uint16_t lat_degmin = (uint16_t)convert_bits_into_output(input + 184, 16);
     uint16_t lat_frac = (uint16_t)convert_bits_into_output(input + 200, 15);
     uint8_t lat_hem = (uint8_t)convert_bits_into_output(input + 215, 1);
     double lat_minutes = (double)(lat_degmin % 100U) + ((double)lat_frac / 10000.0);
-    double lat_decimal = (double)(lat_degmin / 100U) + (lat_minutes / 60.0);
+    double lat_decimal = ((double)lat_degmin / 100.0) + (lat_minutes / 60.0);
     double latitude = (lat_hem == 0U) ? lat_decimal : -lat_decimal;
 
     if (fabs(latitude) > 90.0 || fabs(longitude) > 180.0) {

tests/protocol/dmr/test_dmr_embedded_gps_position_error.c

@@ -218,12 +218,19 @@ main(void) {
         nmea_ascii_to_bits(bits, (int)sizeof(bits), nmea_ok);
         st.dmr_lrrp_source[0] = 111U;
         st.dmr_lrrp_target[0] = 222U;
-        memset(st.event_history_s[0].Event_History_Items[0].text_message, 0,
-               sizeof(st.event_history_s[0].Event_History_Items[0].text_message));
+        if (st.event_history_s != NULL) {
+            memset(st.event_history_s[0].Event_History_Items[0].text_message, 0,
+                   sizeof(st.event_history_s[0].Event_History_Items[0].text_message));
+        }
         uint8_t ok = nmea_sentence_checker(&opts, &st, bits, 0, len_bytes);
         rc |= expect_u8("nmea-valid", ok, 1U);
-        rc |= expect_has_substr(st.event_history_s[0].Event_History_Items[0].text_message, "$GPRMC,TEST*71",
-                                "nmea-valid-text");
+        if (st.event_history_s != NULL) {
+            rc |= expect_has_substr(st.event_history_s[0].Event_History_Items[0].text_message, "$GPRMC,TEST*71",
+                                    "nmea-valid-text");
+        } else {
+            fprintf(stderr, "%s\n", "nmea-valid-text: event_history_s is NULL");
+            rc |= 1;
+        }
         rc |= expect_u32("nmea-valid-src-reset", st.dmr_lrrp_source[0], 0U);
         rc |= expect_u32("nmea-valid-tgt-reset", st.dmr_lrrp_target[0], 0U);
     }
@@ -236,11 +243,18 @@ main(void) {
         nmea_ascii_to_bits(bits, (int)sizeof(bits), nmea_bad);
         st.dmr_lrrp_source[0] = 333U;
         st.dmr_lrrp_target[0] = 444U;
-        memset(st.event_history_s[0].Event_History_Items[0].text_message, 0,
-               sizeof(st.event_history_s[0].Event_History_Items[0].text_message));
+        if (st.event_history_s != NULL) {
+            memset(st.event_history_s[0].Event_History_Items[0].text_message, 0,
+                   sizeof(st.event_history_s[0].Event_History_Items[0].text_message));
+        }
         uint8_t ok = nmea_sentence_checker(&opts, &st, bits, 0, len_bytes);
         rc |= expect_u8("nmea-invalid", ok, 0U);
-        rc |= expect_i("nmea-invalid-text-empty", st.event_history_s[0].Event_History_Items[0].text_message[0], 0);
+        if (st.event_history_s != NULL) {
+            rc |= expect_i("nmea-invalid-text-empty", st.event_history_s[0].Event_History_Items[0].text_message[0], 0);
+        } else {
+            fprintf(stderr, "%s\n", "nmea-invalid-text-empty: event_history_s is NULL");
+            rc |= 1;
+        }
         rc |= expect_u32("nmea-invalid-src-reset", st.dmr_lrrp_source[0], 0U);
         rc |= expect_u32("nmea-invalid-tgt-reset", st.dmr_lrrp_target[0], 0U);
     }

tests/protocol/nxdn/test_nxdn_element_bounds.c

@@ -14,6 +14,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "dsd-neo/core/opts_fwd.h"
+#include "dsd-neo/core/state_fwd.h"
+
 void NXDN_Elements_Content_decode(dsd_opts* opts, dsd_state* state, uint8_t CrcCorrect, uint8_t* ElementsContent,
                                   size_t elements_bits);