time64: Silence compiler warnings about shadowed variable declarations
diff --git a/src/time64.c b/src/time64.c
index 2ed8562..f1cffd4 100644
--- a/src/time64.c
+++ b/src/time64.c
@@ -346,11 +346,11 @@
*/
static int safe_year(const Year year)
{
- int safe_year= (int)year;
+ int _safe_year = (int)year;
Year year_cycle;
if( year >= MIN_SAFE_YEAR && year <= MAX_SAFE_YEAR ) {
- return safe_year;
+ return _safe_year;
}
year_cycle = year + cycle_offset(year);
@@ -374,18 +374,18 @@
assert( year_cycle >= 0 );
assert( year_cycle < SOLAR_CYCLE_LENGTH );
if( year < MIN_SAFE_YEAR )
- safe_year = safe_years_low[year_cycle];
+ _safe_year = safe_years_low[year_cycle];
else if( year > MAX_SAFE_YEAR )
- safe_year = safe_years_high[year_cycle];
+ _safe_year = safe_years_high[year_cycle];
else
assert(0);
TIME64_TRACE3("# year: %lld, year_cycle: %lld, safe_year: %d\n",
- year, year_cycle, safe_year);
+ year, year_cycle, _safe_year);
- assert(safe_year <= MAX_SAFE_YEAR && safe_year >= MIN_SAFE_YEAR);
+ assert(_safe_year <= MAX_SAFE_YEAR && _safe_year >= MIN_SAFE_YEAR);
- return safe_year;
+ return _safe_year;
}
@@ -519,17 +519,17 @@
Time64_T mktime64(struct TM *input_date) {
struct tm safe_date;
struct TM date;
- Time64_T time;
+ Time64_T timev;
Year year = input_date->tm_year + 1900;
if( date_in_safe_range(input_date, &SYSTEM_MKTIME_MIN, &SYSTEM_MKTIME_MAX) )
{
copy_TM64_to_tm(input_date, &safe_date);
- time = (Time64_T)mktime(&safe_date);
+ timev = (Time64_T)mktime(&safe_date);
/* Correct the possibly out of bound input date */
copy_tm_to_TM64(&safe_date, input_date);
- return time;
+ return timev;
}
/* Have to make the year safe in date else it won't fit in safe_date */
@@ -537,14 +537,14 @@
date.tm_year = safe_year(year) - 1900;
copy_TM64_to_tm(&date, &safe_date);
- time = (Time64_T)mktime(&safe_date);
+ timev = (Time64_T)mktime(&safe_date);
/* Correct the user's possibly out of bound input date */
copy_tm_to_TM64(&safe_date, input_date);
- time += seconds_between_years(year, (Year)(safe_date.tm_year + 1900));
+ timev += seconds_between_years(year, (Year)(safe_date.tm_year + 1900));
- return time;
+ return timev;
}
@@ -560,7 +560,7 @@
Time64_T v_tm_tday;
int leap;
Time64_T m;
- Time64_T time = *in_time;
+ Time64_T timev = *in_time;
Year year = 70;
int cycles = 0;
@@ -587,13 +587,13 @@
p->tm_zone = (char*)"UTC";
#endif
- v_tm_sec = (int)(time % 60);
- time /= 60;
- v_tm_min = (int)(time % 60);
- time /= 60;
- v_tm_hour = (int)(time % 24);
- time /= 24;
- v_tm_tday = time;
+ v_tm_sec = (int)(timev % 60);
+ timev /= 60;
+ v_tm_min = (int)(timev % 60);
+ timev /= 60;
+ v_tm_hour = (int)(timev % 24);
+ timev /= 24;
+ v_tm_tday = timev;
WRAP (v_tm_sec, v_tm_min, 60);
WRAP (v_tm_min, v_tm_hour, 60);
@@ -681,7 +681,7 @@
}
-struct TM *localtime64_r (const Time64_T *time, struct TM *local_tm)
+struct TM *localtime64_r (const Time64_T *timev, struct TM *local_tm)
{
time_t safe_time;
struct tm safe_date;
@@ -692,10 +692,10 @@
assert(local_tm != NULL);
/* Use the system localtime() if time_t is small enough */
- if( SHOULD_USE_SYSTEM_LOCALTIME(*time) ) {
- safe_time = (time_t)*time;
+ if( SHOULD_USE_SYSTEM_LOCALTIME(*timev) ) {
+ safe_time = (time_t)*timev;
- TIME64_TRACE1("Using system localtime for %lld\n", *time);
+ TIME64_TRACE1("Using system localtime for %lld\n", *timev);
LOCALTIME_R(&safe_time, &safe_date);
@@ -705,8 +705,8 @@
return local_tm;
}
- if( gmtime64_r(time, &gm_tm) == NULL ) {
- TIME64_TRACE1("gmtime64_r returned null for %lld\n", *time);
+ if( gmtime64_r(timev, &gm_tm) == NULL ) {
+ TIME64_TRACE1("gmtime64_r returned null for %lld\n", *timev);
return NULL;
}
@@ -803,10 +803,10 @@
}
-char *ctime64_r( const Time64_T* time, char* result ) {
+char *ctime64_r( const Time64_T* timev, char* result ) {
struct TM date;
- if (!localtime64_r( time, &date ))
+ if (!localtime64_r( timev, &date ))
return NULL;
return asctime64_r( &date, result );
