wmtime: Use #defines to avoid variable length arrays.

This commit is contained in:
Doug Torrance 2015-05-25 17:21:28 -05:00 committed by Carlos R. Mafra
parent eb93ccf24d
commit fde8a3ef34

View file

@ -455,8 +455,8 @@ draw_window:
\*******************************************************************************/ \*******************************************************************************/
void DrawTime(int hr, int min, int sec) { void DrawTime(int hr, int min, int sec) {
const int time_size = 16; #define TIME_SIZE 16
char time[time_size]; char time[TIME_SIZE];
char *p = time; char *p = time;
int i,j,k=6; int i,j,k=6;
int numfields; int numfields;
@ -464,11 +464,11 @@ void DrawTime(int hr, int min, int sec) {
/* 7x13 */ /* 7x13 */
if (noseconds) { if (noseconds) {
snprintf(time, time_size, "%02d:%02d ", hr, min); snprintf(time, TIME_SIZE, "%02d:%02d ", hr, min);
numfields = 2; numfields = 2;
} }
else { else {
snprintf(time, time_size, "%02d:%02d:%02d ", hr, min, sec); snprintf(time, TIME_SIZE, "%02d:%02d:%02d ", hr, min, sec);
numfields = 3; numfields = 3;
} }
@ -491,14 +491,14 @@ void DrawTime(int hr, int min, int sec) {
\*******************************************************************************/ \*******************************************************************************/
void DrawDate(int wkday, int dom, int month) { void DrawDate(int wkday, int dom, int month) {
const int date_size = 16; #define DATE_SIZE 16
char date[date_size]; char date[DATE_SIZE];
char *p = date; char *p = date;
int i,k; int i,k;
/* 7x13 */ /* 7x13 */
snprintf(date, date_size, snprintf(date, DATE_SIZE,
"%.2s%02d%.3s ", day_of_week[wkday], dom, mon_of_year[month]); "%.2s%02d%.3s ", day_of_week[wkday], dom, mon_of_year[month]);
k = 5; k = 5;