[Gnucash-changes] r14083 - gnucash/trunk - revert r14081 because we
always have localtime_r.
Derek Atkins
warlord at cvs.gnucash.org
Tue May 16 12:18:50 EDT 2006
Author: warlord
Date: 2006-05-16 12:18:49 -0400 (Tue, 16 May 2006)
New Revision: 14083
Trac: http://svn.gnucash.org/trac/changeset/14083
Modified:
gnucash/trunk/ChangeLog
gnucash/trunk/lib/libqof/qof/gnc-date.c
Log:
revert r14081 because we always have localtime_r.
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2006-05-16 09:34:50 UTC (rev 14082)
+++ gnucash/trunk/ChangeLog 2006-05-16 16:18:49 UTC (rev 14083)
@@ -1,3 +1,8 @@
+2006-05-16 Derek Atkins <derek at ihtfp.com>
+
+ * lib/libqof/qof/gnc-date.c:
+ revert r14081 because we always have localtime_r.
+
2006-05-16 Christian Stimming <stimming at tuhh.de>
* lib/libqof/qof/gnc-date.c (timespecCanonicalDayTime)
Modified: gnucash/trunk/lib/libqof/qof/gnc-date.c
===================================================================
--- gnucash/trunk/lib/libqof/qof/gnc-date.c 2006-05-16 09:34:50 UTC (rev 14082)
+++ gnucash/trunk/lib/libqof/qof/gnc-date.c 2006-05-16 16:18:49 UTC (rev 14083)
@@ -249,17 +249,9 @@
timespecCanonicalDayTime(Timespec t)
{
struct tm tm;
-#ifndef HAVE_LOCALTIME_R
- struct tm *result;
-#endif
Timespec retval;
time_t t_secs = t.tv_sec + (t.tv_nsec / NANOS_PER_SECOND);
-#ifndef HAVE_LOCALTIME_R
- result = localtime(&t_secs);
- tm = *result;
-#else
localtime_r(&t_secs, &tm);
-#endif
gnc_tm_set_day_middle(&tm);
retval.tv_sec = mktime(&tm);
retval.tv_nsec = 0;
@@ -503,24 +495,16 @@
size_t
qof_print_date_buff (char * buff, size_t len, time_t t)
{
-#ifdef HAVE_LOCALTIME_R
- struct tm theTime_tm;
-#endif
- struct tm *theTime;
+ struct tm theTime;
if (!buff) return 0 ;
-#ifdef HAVE_LOCALTIME_R
- localtime_r (&t, &theTime_tm);
- theTime = &theTime_tm;
-#else
- theTime = localtime (&t);
-#endif
+ localtime_r(&t, &theTime);
return qof_print_date_dmy_buff (buff, len,
- theTime->tm_mday,
- theTime->tm_mon + 1,
- theTime->tm_year + 1900);
+ theTime.tm_mday,
+ theTime.tm_mon + 1,
+ theTime.tm_year + 1900);
}
size_t
@@ -954,21 +938,13 @@
else
{ /* Make a guess */
unsigned char string[256];
- struct tm *tm;
-#ifdef HAVE_LOCALTIME_R
- struct tm struct_tm;
-#endif
+ struct tm tm;
time_t secs;
unsigned char *s;
secs = time(NULL);
-#ifdef HAVE_LOCALTIME_R
- localtime_r(&secs, &struct_tm);
- tm = &struct_tm;
-#else
- tm = localtime(&secs);
-#endif
- strftime(string, sizeof(string), GNC_D_FMT, tm);
+ localtime_r(&secs, &tm);
+ strftime(string, sizeof(string), GNC_D_FMT, &tm);
for (s = string; s != '\0'; s++)
if (!isdigit(*s))
@@ -1214,38 +1190,22 @@
int
gnc_timespec_last_mday (Timespec t)
{
-#ifdef HAVE_LOCALTIME_R
- struct tm tm;
-#endif
- struct tm *result;
+ struct tm result;
time_t t_secs = t.tv_sec + (t.tv_nsec / NANOS_PER_SECOND);
-#ifdef HAVE_LOCALTIME_R
- localtime_r(&t_secs, &tm);
- result = &tm;
-#else
- result = localtime(&t_secs);
-#endif
- return date_get_last_mday (result);
+ localtime_r(&t_secs, &result);
+ return date_get_last_mday (&result);
}
void
gnc_timespec2dmy (Timespec t, int *day, int *month, int *year)
{
-#ifdef HAVE_LOCALTIME_R
- struct tm tm;
-#endif
- struct tm *result;
+ struct tm result;
time_t t_secs = t.tv_sec + (t.tv_nsec / NANOS_PER_SECOND);
-#ifdef HAVE_LOCALTIME_R
- localtime_r(&t_secs, &tm);
- result = &tm;
-#else
- result = localtime(&t_secs);
-#endif
+ localtime_r(&t_secs, &result);
- if (day) *day = result->tm_mday;
- if (month) *month = result->tm_mon+1;
- if (year) *year = result->tm_year+1900;
+ if (day) *day = result.tm_mday;
+ if (month) *month = result.tm_mon+1;
+ if (year) *year = result.tm_year+1900;
}
/********************************************************************\
More information about the gnucash-changes
mailing list