From 9e2c5ef112d118b7714d91b60f2b13cb1a51a7cf Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 20 Oct 2002 05:34:55 +0000 Subject: [PATCH] (TICKS_TO_MSEC, CLOCKS_TO_MSEC): Do not cast to float, as this generates a warning on Solaris 8 + GCC 3.2 with --enable-gcc-warnings. Instead, divide into 1.0 rather than 1; this generates a more-accurate value anyway. (timervar_accumulate): Rename local variables to avoid confusion with similarly-named global 'start_time'. --- lib/timevar.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/timevar.c b/lib/timevar.c index 7295fbc8..1af62ea8 100644 --- a/lib/timevar.c +++ b/lib/timevar.c @@ -118,12 +118,12 @@ extern clock_t clock PARAMS ((void)); _constants_ variable at run time, anyway? */ #ifdef USE_TIMES static float ticks_to_msec; -#define TICKS_TO_MSEC (1 / (float)TICKS_PER_SECOND) +#define TICKS_TO_MSEC (1.0 / TICKS_PER_SECOND) #endif #ifdef USE_CLOCK static float clocks_to_msec; -#define CLOCKS_TO_MSEC (1 / (float)CLOCKS_PER_SEC) +#define CLOCKS_TO_MSEC (1.0 / CLOCKS_PER_SEC) #endif #if IN_GCC @@ -236,17 +236,17 @@ get_time (now) } } -/* Add the difference between STOP_TIME and START_TIME to TIMER. */ +/* Add the difference between STOP and START to TIMER. */ static void -timevar_accumulate (timer, start_time, stop_time) +timevar_accumulate (timer, start, stop) struct timevar_time_def *timer; - struct timevar_time_def *start_time; - struct timevar_time_def *stop_time; + struct timevar_time_def *start; + struct timevar_time_def *stop; { - timer->user += stop_time->user - start_time->user; - timer->sys += stop_time->sys - start_time->sys; - timer->wall += stop_time->wall - start_time->wall; + timer->user += stop->user - start->user; + timer->sys += stop->sys - start->sys; + timer->wall += stop->wall - start->wall; } /* Initialize timing variables. */ -- 2.45.2