From ec4c4637df41a9b4e37b59f4cb3774a898af9d59 Mon Sep 17 00:00:00 2001 From: lwvmobile <59371473+lwvmobile@users.noreply.github.com> Date: Sat, 13 Aug 2022 13:55:13 -0400 Subject: [PATCH] LRRP Patch 4 Revert getDateL array size; 200 fixes issue in Cygwin, but breaks in Linux builds; (priority is Linux builds) --Will look into a different solution that works on both ends. --- src/dmr_sync.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/dmr_sync.c b/src/dmr_sync.c index 5f8f0b3..d0de1b7 100644 --- a/src/dmr_sync.c +++ b/src/dmr_sync.c @@ -33,8 +33,9 @@ char * getTimeL(void) //get pretty hh:mm:ss timestamp } //getDate has a bug that affects writing to file using fopen 32-bit Ubuntu OS, need to look into +//increasing array size causes date to not print in Linux builds, but fixes cygwin bug, so reverting to 99 until a better fix is worked out. char * getDateL(void) { - char datename[200]; //increased to 200 to fix 32-bit Ubuntu/Cygwin when fopen file printing to lrrp.txt + char datename[99]; //increased to 200 to fix 32-bit Ubuntu/Cygwin when fopen file printing to lrrp.txt char * curr2; struct tm * to; time_t t; @@ -145,8 +146,8 @@ void Process34Data(dsd_opts * opts, dsd_state * state, unsigned char tdibits[98] //pFile = fopen("DSDPlus.LRRP", "a"); //seperate these two values since they cause issues with garbage writing to files in some environments (cygwin) - fprintf (pFile, "%s\t ", getDateL() ); //current date, may find a way to only add this IF no included timestamp in LRRP data? - fprintf (pFile, "%s\t ", getTimeL()) ; //current timestamp, may find a way to only add this IF no included timestamp in LRRP data? + fprintf (pFile, "%s\t", getDateL() ); //current date, may find a way to only add this IF no included timestamp in LRRP data? + fprintf (pFile, "%s\t", getTimeL()) ; //current timestamp, may find a way to only add this IF no included timestamp in LRRP data? fprintf (pFile, "%08lld\t", state->dmr_lrrp_source[state->currentslot]); //source address from data header } @@ -1219,8 +1220,8 @@ void Process12Data(dsd_opts * opts, dsd_state * state, uint8_t info[196], uint8_ //pFile = fopen("DSDPlus.LRRP", "a"); //seperate these two values since they cause issues with garbage writing to files in some environments (cygwin) - fprintf (pFile, "%s\t ", getDateL() ); //current date, may find a way to only add this IF no included timestamp in LRRP data? - fprintf (pFile, "%s\t ", getTimeL() ); //current timestamp, may find a way to only add this IF no included timestamp in LRRP data? + fprintf (pFile, "%s\t", getDateL() ); //current date, may find a way to only add this IF no included timestamp in LRRP data? + fprintf (pFile, "%s\t", getTimeL() ); //current timestamp, may find a way to only add this IF no included timestamp in LRRP data? fprintf (pFile, "%08lld\t", state->dmr_lrrp_source[state->currentslot]); //source address from data header }