From d4599b05a068766c3dbd51a8b9771432f08fee06 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Mon, 10 Jul 2023 20:09:42 -0400 Subject: [PATCH] Appease Volo - God of Compiler Warnings; --- src/m17.c | 5 ++--- src/ysf.c | 14 +++++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/m17.c b/src/m17.c index d86b903..06cce51 100644 --- a/src/m17.c +++ b/src/m17.c @@ -68,9 +68,8 @@ uint16_t crc16m17(const uint8_t *in, const uint16_t len) void M17decodeCSD(dsd_state * state, unsigned long long int dst, unsigned long long int src) { //evaluate dst and src, and determine if they need to be converted to calsign - int i, j; + int i; char c; - unsigned long long int value; if (dst == 0xFFFFFFFFFFFF) fprintf (stderr, " DST: BROADCAST"); @@ -448,7 +447,7 @@ void M17processCodec2_3200(dsd_opts * opts, dsd_state * state, uint8_t payload[1 void M17prepareStream(dsd_opts * opts, dsd_state * state, uint8_t m17_bits[368]) { - int i, j, k, x; + int i, k, x; uint8_t m17_punc[310]; //25 * 11 = 275 memset (m17_punc, 0, sizeof(m17_punc)); for (i = 0; i < 272; i++) diff --git a/src/ysf.c b/src/ysf.c index 212dd83..46cee79 100644 --- a/src/ysf.c +++ b/src/ysf.c @@ -132,7 +132,7 @@ const int vd2Interleave[104] = { 25, 51, 77, 103 }; -void ysf_dch_decode (dsd_opts * opts, dsd_state * state, uint8_t bn, uint8_t bt, uint8_t fn, uint8_t ft, uint8_t cm, uint8_t input[]) +void ysf_dch_decode (dsd_state * state, uint8_t bn, uint8_t bt, uint8_t fn, uint8_t ft, uint8_t cm, uint8_t input[]) { //TODO: Per Call WAV files using these strings int i; @@ -143,6 +143,8 @@ void ysf_dch_decode (dsd_opts * opts, dsd_state * state, uint8_t bn, uint8_t bt, char rem1[6]; char rem2[6]; + UNUSED3(bt, fn, ft); + for (i = 0; i < 20; i++) dch_bytes[i] = (char)ConvertBitIntoBytes(&input[i*8], 8); @@ -238,7 +240,7 @@ void ysf_dch_decode (dsd_opts * opts, dsd_state * state, uint8_t bn, uint8_t bt, } -void ysf_dch_decode2 (dsd_opts * opts, dsd_state * state, uint8_t bn, uint8_t bt, uint8_t fn, uint8_t ft, uint8_t cm, uint8_t input[]) +void ysf_dch_decode2 (dsd_state * state, uint8_t bn, uint8_t bt, uint8_t fn, uint8_t ft, uint8_t cm, uint8_t input[]) { //TODO: Per Call WAV files using these strings int i; @@ -248,6 +250,8 @@ void ysf_dch_decode2 (dsd_opts * opts, dsd_state * state, uint8_t bn, uint8_t bt char rem1[6]; char rem2[6]; + UNUSED4(bn, bt, fn, ft); + for (i = 0; i < 10; i++) dch_bytes[i] = (char)ConvertBitIntoBytes(&input[i*8], 8); @@ -444,7 +448,7 @@ int ysf_conv_dch2 (dsd_opts * opts, dsd_state * state, uint8_t bn, uint8_t bt, u //decode the callsign, etc, found in the DCH when no errors if (err == 0) - ysf_dch_decode2 (opts, state, bn, bt, fn, ft, cm, trellis_buf); + ysf_dch_decode2 (state, bn, bt, fn, ft, cm, trellis_buf); else { fprintf (stderr, "%s", KRED); @@ -537,7 +541,7 @@ int ysf_conv_dch (dsd_opts * opts, dsd_state * state, uint8_t bn, uint8_t bt, ui //decode the callsign, etc, found in the DCH when no errors if (err == 0) - ysf_dch_decode (opts, state, bn, bt, fn, ft, cm, trellis_buf); + ysf_dch_decode (state, bn, bt, fn, ft, cm, trellis_buf); else { fprintf (stderr, "%s", KRED); @@ -618,7 +622,7 @@ int ysf_conv_fich (uint8_t input[], uint8_t dest[32]) } uint8_t fich_bits[12*4]; - char temp_b[24]; + uint8_t temp_b[24]; bool g[4]; // run golay 24_12 error correction