From 9f90f2f23e60a20ca052681268912f2e5c900b11 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 17 Nov 2005 17:51:59 +0000 Subject: [PATCH] Add functions to set a date from a time_t and from a GTimeVal. 2005-11-17 Matthias Clasen * glib/glib.symbols: * glib/gdate.h: * glib/gdate.c (g_date_set_time_t): (g_date_set_time_val): Add functions to set a date from a time_t and from a GTimeVal. (g_date_set_time): Deprecate. (#314067, Roger Leigh) --- ChangeLog | 7 ++++ ChangeLog.pre-2-10 | 7 ++++ ChangeLog.pre-2-12 | 7 ++++ docs/reference/ChangeLog | 6 +++ docs/reference/glib/glib-sections.txt | 2 + docs/reference/glib/tmpl/date.sgml | 16 ++++---- glib/gdate.c | 72 +++++++++++++++++++++++++++++------ glib/gdate.h | 9 +++++ glib/glib.symbols | 4 ++ 9 files changed, 110 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index ba16472..b527b1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2005-11-17 Matthias Clasen + * glib/glib.symbols: + * glib/gdate.h: + * glib/gdate.c (g_date_set_time_t): + (g_date_set_time_val): Add functions to set a date from + a time_t and from a GTimeVal. + (g_date_set_time): Deprecate. (#314067, Roger Leigh) + * tests/Makefile.am: * tests/utf8-pointer.c: Unit tests for g_utf8_pointer_to_offset and g_utf8_offset_to_pointer. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ba16472..b527b1a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,12 @@ 2005-11-17 Matthias Clasen + * glib/glib.symbols: + * glib/gdate.h: + * glib/gdate.c (g_date_set_time_t): + (g_date_set_time_val): Add functions to set a date from + a time_t and from a GTimeVal. + (g_date_set_time): Deprecate. (#314067, Roger Leigh) + * tests/Makefile.am: * tests/utf8-pointer.c: Unit tests for g_utf8_pointer_to_offset and g_utf8_offset_to_pointer. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index ba16472..b527b1a 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,12 @@ 2005-11-17 Matthias Clasen + * glib/glib.symbols: + * glib/gdate.h: + * glib/gdate.c (g_date_set_time_t): + (g_date_set_time_val): Add functions to set a date from + a time_t and from a GTimeVal. + (g_date_set_time): Deprecate. (#314067, Roger Leigh) + * tests/Makefile.am: * tests/utf8-pointer.c: Unit tests for g_utf8_pointer_to_offset and g_utf8_offset_to_pointer. diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 0969a7c..42c274c 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,9 @@ +2005-11-17 Matthias Clasen + + * glib/tmpl/date.sgml: + * glib/glib-sections.txt: Add g_date_set_time_t, + g_date_set_time_val. + 2005-11-08 Matthias Clasen * glib/tmpl/threads.sgml: Improve GOnce docs. diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt index 80cd93d..efae15c 100644 --- a/docs/reference/glib/glib-sections.txt +++ b/docs/reference/glib/glib-sections.txt @@ -1171,6 +1171,8 @@ g_date_set_year g_date_set_dmy g_date_set_julian g_date_set_time +g_date_set_time_t +g_date_set_time_val g_date_set_parse diff --git a/docs/reference/glib/tmpl/date.sgml b/docs/reference/glib/tmpl/date.sgml index 83985ad..7ec4648 100644 --- a/docs/reference/glib/tmpl/date.sgml +++ b/docs/reference/glib/tmpl/date.sgml @@ -136,9 +136,13 @@ month, and year. -Simply a replacement for time_t. Unrelated to #GTimer. +Simply a replacement for time_t. It has been deprected +since it is not equivalent to time_t +on 64-bit platforms with a 64-bit time_t. +Unrelated to #GTimer. + Note that GTime is defined to always be a 32bit integer, unlike time_t which may be 64bit on some systems. @@ -346,15 +350,11 @@ Sets the value of a #GDate from a Julian day number. -Sets the value of a date from a #GTime (time_t) value. -To set the value of a date to the current day, you could write: - -g_date_set_time (date, time (NULL)); - + -@date: a #GDate. -@time_: #GTime value to set. +@date: +@time_: diff --git a/glib/gdate.c b/glib/gdate.c index 3e9db33..17212a3 100644 --- a/glib/gdate.c +++ b/glib/gdate.c @@ -859,20 +859,33 @@ g_date_set_parse (GDate *d, G_UNLOCK (g_date_global); } +/** + * g_date_set_time_t: + * @date: a #GDate + * @timet: time_t value to set + * + * Sets the value of a date from a time_t value. + * + * To set the value of a date to the current day, you could write: + * + * g_date_set_time_t (date, time (NULL)); + * + * + * Since: 2.10 + */ void -g_date_set_time (GDate *d, - GTime time) +g_date_set_time_t (GDate *date, + time_t timet) { - time_t t = time; struct tm tm; - g_return_if_fail (d != NULL); + g_return_if_fail (date != NULL); #ifdef HAVE_LOCALTIME_R - localtime_r (&t, &tm); + localtime_r (&timet, &tm); #else { - struct tm *ptm = localtime (&t); + struct tm *ptm = localtime (&timet); if (ptm == NULL) { @@ -892,15 +905,50 @@ g_date_set_time (GDate *d, } #endif - d->julian = FALSE; + date->julian = FALSE; - d->month = tm.tm_mon + 1; - d->day = tm.tm_mday; - d->year = tm.tm_year + 1900; + date->month = tm.tm_mon + 1; + date->day = tm.tm_mday; + date->year = tm.tm_year + 1900; - g_return_if_fail (g_date_valid_dmy (d->day, d->month, d->year)); + g_return_if_fail (g_date_valid_dmy (date->day, date->month, date->year)); - d->dmy = TRUE; + date->dmy = TRUE; +} + + +/** + * g_date_set_time: + * @date: a #GDate. + * @time_: #GTime value to set. + * + * Sets the value of a date from a #GTime value. + * + * @Deprecated: Use g_date_set_time_t() instead. + */ +void +g_date_set_time (GDate *date, + GTime *time_) +{ + g_date_set_time_t (date, (time_t) time_); +} + +/** + * g_date_set_time_val: + * @date: a #GDate + * @timeval: #GTimeVal value to set + * + * Sets the value of a date from a #GTimeVal value. Note that the + * @tv_usec member is ignored, because #GDate can't make use of the + * additional precision. + * + * Since: 2.10 + */ +void +g_date_set_time_val (GDate *date, + GTimeVal *timeval) +{ + g_date_set_time_t (date, (time_t) timeval->tv_sec); } void diff --git a/glib/gdate.h b/glib/gdate.h index eafb16a..e2ee215 100644 --- a/glib/gdate.h +++ b/glib/gdate.h @@ -27,6 +27,9 @@ #ifndef __G_DATE_H__ #define __G_DATE_H__ +#include + +#include #include G_BEGIN_DECLS @@ -165,8 +168,14 @@ void g_date_clear (GDate *date, */ void g_date_set_parse (GDate *date, const gchar *str); +void g_date_set_time_t (GDate *date, + time_t timet); +void g_date_set_time_val (GDate *date, + GTimeVal *timeval); +#ifndef G_DISABLE_DEPRECATED void g_date_set_time (GDate *date, GTime time_); +#endif void g_date_set_month (GDate *date, GDateMonth month); void g_date_set_day (GDate *date, diff --git a/glib/glib.symbols b/glib/glib.symbols index fe4bef1..abe997f 100644 --- a/glib/glib.symbols +++ b/glib/glib.symbols @@ -213,7 +213,11 @@ g_date_set_dmy g_date_set_julian g_date_set_month g_date_set_parse +#ifndef G_DISABLE_DEPRECATED g_date_set_time +#endif +g_date_set_time_t +g_date_set_time_val g_date_set_year g_date_strftime g_date_subtract_days -- 2.7.4