Skip to content
Snippets Groups Projects
Commit 07dcd91b authored by deuce's avatar deuce
Browse files

This is probobly the worst place to shadow time() with a variable.

parent 1e829c5a
No related branches found
No related tags found
No related merge requests found
......@@ -135,17 +135,17 @@ time_t xpDateTime_to_time(xpDateTime_t xpDateTime)
}
xpDateTime_t time_to_xpDateTime(time_t time)
xpDateTime_t time_to_xpDateTime(time_t ti)
{
xpDateTime_t never;
struct tm tm;
memset(&never,0,sizeof(never));
if(time==0)
if(ti==0)
return(never);
ZERO_VAR(tm);
if(gmtime_r(&time,&tm)==NULL)
if(gmtime_r(&ti,&tm)==NULL)
return(never);
return xpDateTime_create(1900+tm.tm_year,1+tm.tm_mon,tm.tm_mday
......@@ -170,24 +170,24 @@ isoDate_t xpDateTime_to_isoDateTime(xpDateTime_t xpDateTime, isoTime_t* isoTime)
return isoDate_create(xpDateTime.date.year,xpDateTime.date.month,xpDateTime.date.day);
}
xpDateTime_t isoDateTime_to_xpDateTime(isoDate_t date, isoTime_t time)
xpDateTime_t isoDateTime_to_xpDateTime(isoDate_t date, isoTime_t ti)
{
return xpDateTime_create(isoDate_year(date),isoDate_month(date),isoDate_day(date)
,isoTime_hour(time),isoTime_minute(time),(float)isoTime_second(time),xpTimeZone_local());
,isoTime_hour(ti),isoTime_minute(ti),(float)isoTime_second(ti),xpTimeZone_local());
}
isoDate_t time_to_isoDateTime(time_t time, isoTime_t* isoTime)
isoDate_t time_to_isoDateTime(time_t ti, isoTime_t* isoTime)
{
struct tm tm;
if(isoTime!=NULL)
*isoTime=0;
if(time==0)
if(ti==0)
return(0);
ZERO_VAR(tm);
if(gmtime_r(&time,&tm)==NULL)
if(gmtime_r(&ti,&tm)==NULL)
return(0);
if(isoTime!=NULL)
......@@ -196,16 +196,16 @@ isoDate_t time_to_isoDateTime(time_t time, isoTime_t* isoTime)
return isoDate_create(1900+tm.tm_year,1+tm.tm_mon,tm.tm_mday);
}
isoTime_t time_to_isoTime(time_t time)
isoTime_t time_to_isoTime(time_t ti)
{
isoTime_t isoTime;
time_to_isoDateTime(time,&isoTime);
time_to_isoDateTime(ti,&isoTime);
return isoTime;
}
time_t isoDateTime_to_time(isoDate_t date, isoTime_t time)
time_t isoDateTime_to_time(isoDate_t date, isoTime_t ti)
{
struct tm tm;
......@@ -218,9 +218,9 @@ time_t isoDateTime_to_time(isoDate_t date, isoTime_t time)
tm.tm_mon = isoDate_month(date);
tm.tm_mday = isoDate_day(date);
tm.tm_hour = isoTime_hour(time);
tm.tm_min = isoTime_minute(time);
tm.tm_sec = isoTime_second(time);
tm.tm_hour = isoTime_hour(ti);
tm.tm_min = isoTime_minute(ti);
tm.tm_sec = isoTime_second(ti);
return sane_mktime(&tm);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment