ua1zbe
/
dsd-fme
mirror of https://github.com/lwvmobile/dsd-fme.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TIME: malloc and HHmmss Nits; Remove Unneeded time/date strings from Ncurses;

This commit is contained in:
lwvmobile 2024-04-25 11:27:26 -04:00
parent ab9a9ddab3
commit 9da8544408
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/dsd_ncurses.c
View File

@ -32,8 +32,6 @@ static char alias_ch[10][50];
int reset = 0; int reset = 0;
char * timestr; char * timestr;
char * datestr; char * datestr;
char * timestrC;
char * datestrH;
int tg; int tg;
int tgR; int tgR;
int tgn; int tgn;
@ -1955,9 +1953,9 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
timestr = getTime(); timestr = getTime();
datestr = getDate(); datestr = getDate();
//for display //NOTE: Any times associates with call history are stored
timestrC = getTimeC(); //in the array and need to be set by passing those values into
datestrH = getDateH(); //getTimeN and getDateN
if (opts->audio_in_type != 1) //can't run getch/menu when using STDIN - if (opts->audio_in_type != 1) //can't run getch/menu when using STDIN -
{ {
@ -4846,8 +4844,6 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
//allocated memory pointer needs to be free'd //allocated memory pointer needs to be free'd
if (timestr != NULL) free (timestr); if (timestr != NULL) free (timestr);
if (datestr != NULL) free (datestr); if (datestr != NULL) free (datestr);
if (timestrC != NULL) free (timestrC);
if (datestrH != NULL) free (datestrH);
} //end ncursesPrinter } //end ncursesPrinter

12
src/dsd_time.c
View File

@ -6,22 +6,22 @@
* 2024-04 DSD-FME Florida Man Edition * 2024-04 DSD-FME Florida Man Edition
*-----------------------------------------------------------------------------*/ *-----------------------------------------------------------------------------*/
//TODO: Make sure everything still works as intended, no random crashes on free (timestr) //TODO: Make sure everything still works as intended, every free(timestr) has a NULL check first,
//make sure no other loose or random time functions embedded in other files or functions, etc //make sure no other loose or random time functions embedded in other files or functions, etc
#include "dsd.h" #include "dsd.h"
//get hhmmss timestamp no colon (file operations) //get HHmmss timestamp no colon (file operations)
char * getTime() char * getTime()
{ {
char * curr = (char *) malloc(9); char * curr = (char *) malloc(7);
time_t t = time(NULL); time_t t = time(NULL);
struct tm * ptm = localtime(& t); struct tm * ptm = localtime(& t);
sprintf(curr,"%02d%02d%02d", ptm->tm_hour, ptm->tm_min, ptm->tm_sec); sprintf(curr,"%02d%02d%02d", ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
return curr; return curr;
} }
//get hh:mm:ss timestamp with colon (Ncurses Display) //get HH:mm:ss timestamp with colon (Sync/Console Display)
char * getTimeC() char * getTimeC()
{ {
char * curr = (char *) malloc(9); char * curr = (char *) malloc(9);
@ -31,7 +31,7 @@ char * getTimeC()
return curr; return curr;
} }
//get hh:mm:ss timestamp with colon (Ncurses Display) //get HH:mm:ss timestamp with colon (Ncurses Call History)
char * getTimeN(time_t t) char * getTimeN(time_t t)
{ {
char * curr = (char *) malloc(9); char * curr = (char *) malloc(9);
@ -50,7 +50,7 @@ char * getDate()
return curr; return curr;
} }
//get YYYY-MM-DD with hyphen (Ncurses Display) //get YYYY-MM-DD with hyphen (Sync/Console Display)
char * getDateH() char * getDateH()
{ {
char * curr = (char *) malloc(27); char * curr = (char *) malloc(27);