--- a/tcpCode.cpp +++ b/tcpCode.cpp @@ -775,7 +775,7 @@ QByteArray datas = HAMLIBsock->readAll(); - qDebug(datas.data()); + qDebug("SetPTT Error: %s", datas.data()); } --- a/ax25.c +++ b/ax25.c @@ -1758,7 +1758,7 @@ -get_monitor_path(Byte * path, char * mycall, char * corrcall, char * digi) +void get_monitor_path(Byte * path, char * mycall, char * corrcall, char * digi) { Byte * digiptr = digi; --- a/ax25_l2.c +++ b/ax25_l2.c @@ -374,7 +374,7 @@ void delete_I_FRM_port(TAX25Port * AX25Sess) { string * frame; - string path = { 0 }; + Byte path[80]; string data= { 0 }; Byte pid, nr, ns, f_type, f_id, rpt, cr, pf; @@ -386,7 +386,7 @@ optimize = TRUE; frame = Strings(&AX25Sess->frame_buf, i); - decode_frame(frame->Data, frame->Length, &path, &data, &pid, &nr, &ns, &f_type, &f_id, &rpt, &pf, &cr); + decode_frame(frame->Data, frame->Length, path, &data, &pid, &nr, &ns, &f_type, &f_id, &rpt, &pf, &cr); if (f_id == I_I) { @@ -916,7 +916,7 @@ while (i != AX25Sess->hi_vs) { - i = (i++) & 7; + i = (i + 1) & 7; need_frame[index++] = i + '0'; if (index > 10) { --- a/UZ7HOStuff.h +++ b/UZ7HOStuff.h @@ -1096,6 +1096,20 @@ BOOL ConvToAX25(char * callsign, unsigned char * ax25call); void Debugprintf(const char * format, ...); +// Hibby's collection for GCC14 and Hardening +void closeTraceLog(); +void get_monitor_path(Byte * path, char * mycall, char * corrcall, char * digi); +void decode_frame(Byte * frame, int len, Byte * path, string * data, Byte * pid, Byte * nr, Byte * ns, Byte * f_type, Byte * f_id, Byte * rpt, Byte * pf, Byte * cr); +void Demodulator(int snd_ch, int rcvr_nr, float * src_buf, int last, int xcenter); +void sendSamplestoUDP(short * Samples, int nSamples, int Port); +void RSIDProcessSamples(short * Samples, int nSamples); +void ARDOPProcessNewSamples(int chan, short * Samples, int nSamples); +void ProcessRXFrames(int snd_ch); +void doWaterfall(int snd_ch); +void displayWaterfall(); +void timer_event(); +void CheckPSKWindows(); + double pila(double x); void AGW_Raw_monitor(int snd_ch, string * data); @@ -1190,4 +1204,4 @@ #ifdef __cplusplus } -#endif \ No newline at end of file +#endif --- a/SMMain.c +++ b/SMMain.c @@ -223,8 +223,9 @@ if (using48000) { // Need to upsample to 48K. Try just duplicating sample - - uint32_t * ptr = &DMABuffer[2 * Number]; + // split init and initialisation for compiler cleanliness + uint32_t * ptr; + ptr = (uint32_t *)&DMABuffer[2 * Number]; *(&ptr[1]) = *(ptr); *(&ptr[2]) = *(ptr); @@ -388,7 +389,7 @@ #endif extern int blnBusyStatus; -BusyDet = 5; +int BusyDet = 5; #define PLOTWATERFALL --- a/sm_main.c +++ b/sm_main.c @@ -796,7 +796,8 @@ void runModems() { - int snd_ch, res; + int snd_ch; + void *res; pthread_t thread[4] = { 0,0,0,0 }; for (snd_ch = 0; snd_ch < 4; snd_ch++) --- a/il2p.c +++ b/il2p.c @@ -394,6 +394,11 @@ typedef enum cmdres_e { cr_00 = 2, cr_cmd = 1, cr_res = 0, cr_11 = 3 } cmdres_t; +// Hibby: Headers for GCC14 + +int set_addrs(packet_t pp, char addrs, int num_addr, cmdres_t cr); +static inline int ax25_get_control_offset(packet_t this_p); +static inline int ax25_get_num_control(packet_t this_p); extern packet_t ax25_new(void);