+Wed Dec 2 02:10:59 1998 Tim Janik <timj@gtk.org>
+
+ * gdate.c: s/time_t/GTime/ and s/g_print/g_message/
+ include time.h.
+
+ * glib.h: removed #include <time.h>, changed time_t paramter of
+ g_date_set_time() to time_t, changed struct tm parameter of
+ g_date_to_struct_tm to `gpointer struct_tm_p'. yes, this is not
+ nice, but including time.h actually breaks a bunch of code.
+
+ * incremented GLib version to 1.1.6.
+
1998-11-30 Havoc Pennington <hp@pobox.com>
* gdate.c: New file, implements calendrical calculations.
+Wed Dec 2 02:10:59 1998 Tim Janik <timj@gtk.org>
+
+ * gdate.c: s/time_t/GTime/ and s/g_print/g_message/
+ include time.h.
+
+ * glib.h: removed #include <time.h>, changed time_t paramter of
+ g_date_set_time() to time_t, changed struct tm parameter of
+ g_date_to_struct_tm to `gpointer struct_tm_p'. yes, this is not
+ nice, but including time.h actually breaks a bunch of code.
+
+ * incremented GLib version to 1.1.6.
+
1998-11-30 Havoc Pennington <hp@pobox.com>
* gdate.c: New file, implements calendrical calculations.
+Wed Dec 2 02:10:59 1998 Tim Janik <timj@gtk.org>
+
+ * gdate.c: s/time_t/GTime/ and s/g_print/g_message/
+ include time.h.
+
+ * glib.h: removed #include <time.h>, changed time_t paramter of
+ g_date_set_time() to time_t, changed struct tm parameter of
+ g_date_to_struct_tm to `gpointer struct_tm_p'. yes, this is not
+ nice, but including time.h actually breaks a bunch of code.
+
+ * incremented GLib version to 1.1.6.
+
1998-11-30 Havoc Pennington <hp@pobox.com>
* gdate.c: New file, implements calendrical calculations.
+Wed Dec 2 02:10:59 1998 Tim Janik <timj@gtk.org>
+
+ * gdate.c: s/time_t/GTime/ and s/g_print/g_message/
+ include time.h.
+
+ * glib.h: removed #include <time.h>, changed time_t paramter of
+ g_date_set_time() to time_t, changed struct tm parameter of
+ g_date_to_struct_tm to `gpointer struct_tm_p'. yes, this is not
+ nice, but including time.h actually breaks a bunch of code.
+
+ * incremented GLib version to 1.1.6.
+
1998-11-30 Havoc Pennington <hp@pobox.com>
* gdate.c: New file, implements calendrical calculations.
+Wed Dec 2 02:10:59 1998 Tim Janik <timj@gtk.org>
+
+ * gdate.c: s/time_t/GTime/ and s/g_print/g_message/
+ include time.h.
+
+ * glib.h: removed #include <time.h>, changed time_t paramter of
+ g_date_set_time() to time_t, changed struct tm parameter of
+ g_date_to_struct_tm to `gpointer struct_tm_p'. yes, this is not
+ nice, but including time.h actually breaks a bunch of code.
+
+ * incremented GLib version to 1.1.6.
+
1998-11-30 Havoc Pennington <hp@pobox.com>
* gdate.c: New file, implements calendrical calculations.
+Wed Dec 2 02:10:59 1998 Tim Janik <timj@gtk.org>
+
+ * gdate.c: s/time_t/GTime/ and s/g_print/g_message/
+ include time.h.
+
+ * glib.h: removed #include <time.h>, changed time_t paramter of
+ g_date_set_time() to time_t, changed struct tm parameter of
+ g_date_to_struct_tm to `gpointer struct_tm_p'. yes, this is not
+ nice, but including time.h actually breaks a bunch of code.
+
+ * incremented GLib version to 1.1.6.
+
1998-11-30 Havoc Pennington <hp@pobox.com>
* gdate.c: New file, implements calendrical calculations.
+Wed Dec 2 02:10:59 1998 Tim Janik <timj@gtk.org>
+
+ * gdate.c: s/time_t/GTime/ and s/g_print/g_message/
+ include time.h.
+
+ * glib.h: removed #include <time.h>, changed time_t paramter of
+ g_date_set_time() to time_t, changed struct tm parameter of
+ g_date_to_struct_tm to `gpointer struct_tm_p'. yes, this is not
+ nice, but including time.h actually breaks a bunch of code.
+
+ * incremented GLib version to 1.1.6.
+
1998-11-30 Havoc Pennington <hp@pobox.com>
* gdate.c: New file, implements calendrical calculations.
+Wed Dec 2 02:10:59 1998 Tim Janik <timj@gtk.org>
+
+ * gdate.c: s/time_t/GTime/ and s/g_print/g_message/
+ include time.h.
+
+ * glib.h: removed #include <time.h>, changed time_t paramter of
+ g_date_set_time() to time_t, changed struct tm parameter of
+ g_date_to_struct_tm to `gpointer struct_tm_p'. yes, this is not
+ nice, but including time.h actually breaks a bunch of code.
+
+ * incremented GLib version to 1.1.6.
+
1998-11-30 Havoc Pennington <hp@pobox.com>
* gdate.c: New file, implements calendrical calculations.
#
GLIB_MAJOR_VERSION=1
GLIB_MINOR_VERSION=1
-GLIB_MICRO_VERSION=5
+GLIB_MICRO_VERSION=6
GLIB_INTERFACE_AGE=0
GLIB_BINARY_AGE=0
GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
*/
#include "glib.h"
+#include <time.h>
#include <string.h>
#include <ctype.h>
#include <stdlib.h>
g_return_val_if_fail (g_date_valid_mdy (m, day, y), NULL);
d = g_new (GDate, 1);
-
+
d->julian = FALSE;
d->mdy = TRUE;
-
+
d->month = m;
d->day = day;
d->year = y;
g_assert (g_date_valid (d));
-
+
return d;
}
g_return_val_if_fail (g_date_valid_julian (j), NULL);
d = g_new (GDate, 1);
-
+
d->julian = TRUE;
d->mdy = FALSE;
-
+
d->julian_days = j;
g_assert (g_date_valid (d));
-
+
return d;
}
g_date_free (GDate *d)
{
g_return_if_fail (d != NULL);
-
+
g_free (d);
}
g_date_valid (GDate *d)
{
g_return_val_if_fail (d != NULL, FALSE);
-
+
if (d->julian && d->mdy)
{
return ( g_date_valid_julian (d->julian_days) &&
g_date_valid_mdy (d->month, d->day, d->year) );
-
+
}
else if (d->mdy)
{
gboolean
g_date_valid_mdy (GDateMonth m,
- GDateDay d,
- GDateYear y)
+ GDateDay d,
+ GDateYear y)
{
return ( (m > G_DATE_BAD_MONTH) &&
(m < 13) &&
(d > G_DATE_BAD_DAY) &&
(y > G_DATE_BAD_YEAR) && /* must check before using g_date_is_leap_year */
(d <= (g_date_is_leap_year (y) ?
- days_in_months[1][m] : days_in_months[0][m])) );
+ days_in_months[1][m] : days_in_months[0][m])) );
}
{
GDateYear year;
gint index;
-
+
g_return_if_fail (d != NULL);
g_return_if_fail (d->mdy);
g_return_if_fail (!d->julian);
g_return_if_fail (g_date_valid_mdy (d->month, d->day, d->year));
-
+
/* What we actually do is: multiply years * 365 days in the year,
* add the number of years divided by 4, subtract the number of
* years divided by 100 and add the number of years divided by 400,
* which accounts for leap year stuff. Code from Steffen Beyer's
* DateCalc.
*/
-
+
year = d->year - 1; /* we know d->year > 0 since it's valid */
-
+
d->julian_days = year * 365U;
d->julian_days += (year >>= 2); /* divide by 4 and add */
d->julian_days -= (year /= 25); /* divides original # years by 100 */
d->julian_days += year >> 2; /* divides by 4, which divides original by 400 */
-
+
index = g_date_is_leap_year (d->year) ? 1 : 0;
-
+
d->julian_days += days_in_year[index][d->month] + d->day;
-
+
g_return_if_fail (g_date_valid_julian (d->julian_days));
-
+
d->julian = TRUE;
}
GDateYear y;
GDateMonth m;
GDateDay day;
-
+
guint32 A, B, C, D, E, M;
-
+
g_return_if_fail (d != NULL);
g_return_if_fail (d->julian);
g_return_if_fail (!d->mdy);
g_return_if_fail (g_date_valid_julian (d->julian_days));
-
+
/* Formula taken from the Calendar FAQ; the formula was for the
* Julian Period which starts on 1 January 4713 BC, so we add
* 1,721,425 to the number of days before doing the formula.
* I'm sure this can be simplified for our 1 January 1 AD period
* start, but I can't figure out how to unpack the formula.
*/
-
+
A = d->julian_days + 1721425 + 32045;
B = ( 4 *(A + 36524) )/ 146097 - 1;
C = A - (146097 * B)/4;
m = M + 3 - (12*(M/10));
day = E - (153*M + 2)/5;
y = 100 * B + D - 4800 + (M/10);
-
+
#ifdef G_ENABLE_DEBUG
if (!g_date_valid_mdy (m, day, y))
{
g_warning ("\nOOPS julian: %u computed mdy: %u %u %u\n",
- d->julian_days, m, day, y);
+ d->julian_days, m, day, y);
}
#endif
-
+
d->month = m;
d->day = day;
d->year = y;
-
+
d->mdy = TRUE;
}
{
g_return_val_if_fail (d != NULL, G_DATE_BAD_WEEKDAY);
g_return_val_if_fail (g_date_valid (d), G_DATE_BAD_WEEKDAY);
-
+
if (!d->julian)
{
g_date_update_julian (d);
}
g_return_val_if_fail (d->julian, G_DATE_BAD_WEEKDAY);
-
+
return ((d->julian_days - 1) % 7) + 1;
}
{
g_return_val_if_fail (d != NULL, G_DATE_BAD_MONTH);
g_return_val_if_fail (g_date_valid (d), G_DATE_BAD_MONTH);
-
+
if (!d->mdy)
{
g_date_update_mdy (d);
{
g_return_val_if_fail (d != NULL, G_DATE_BAD_YEAR);
g_return_val_if_fail (g_date_valid (d), G_DATE_BAD_YEAR);
-
+
if (!d->mdy)
{
g_date_update_mdy (d);
}
g_return_val_if_fail (d->mdy, G_DATE_BAD_YEAR);
-
+
return d->year;
}
{
g_return_val_if_fail (d != NULL, G_DATE_BAD_DAY);
g_return_val_if_fail (g_date_valid (d), G_DATE_BAD_DAY);
-
+
if (!d->mdy)
{
g_date_update_mdy (d);
{
g_return_val_if_fail (d != NULL, G_DATE_BAD_JULIAN);
g_return_val_if_fail (g_date_valid (d), G_DATE_BAD_JULIAN);
-
+
if (!d->julian)
{
g_date_update_julian (d);
g_date_day_of_year (GDate *d)
{
gint index;
-
+
g_return_val_if_fail (d != NULL, 0);
g_return_val_if_fail (g_date_valid (d), 0);
-
+
if (!d->mdy)
{
g_date_update_mdy (d);
}
g_return_val_if_fail (d->mdy, 0);
-
+
index = g_date_is_leap_year (d->year) ? 1 : 0;
return (days_in_year[index][d->month] + d->day);
GDateWeekday wd;
guint day;
GDate first;
-
+
g_return_val_if_fail (d != NULL, 0);
g_return_val_if_fail (g_date_valid (d), 0);
-
+
if (!d->mdy)
{
g_date_update_mdy (d);
}
g_return_val_if_fail (d->mdy, 0);
-
+
g_date_clear (&first, 1);
-
+
g_date_set_mdy (&first, 1, 1, d->year);
-
+
wd = g_date_weekday (&first) - 1; /* make Monday day 0 */
day = g_date_day_of_year (d) - 1;
-
+
return ((day + wd)/7U + (wd == 0 ? 1 : 0));
}
GDateWeekday wd;
guint day;
GDate first;
-
+
g_return_val_if_fail (d != NULL, 0);
g_return_val_if_fail (g_date_valid (d), 0);
-
+
if (!d->mdy)
{
g_date_update_mdy (d);
}
g_return_val_if_fail (d->mdy, 0);
-
+
g_date_clear (&first, 1);
-
+
g_date_set_mdy (&first, 1, 1, d->year);
-
+
wd = g_date_weekday (&first);
if (wd == 7) wd = 0; /* make Sunday day 0 */
day = g_date_day_of_year (d) - 1;
-
+
return ((day + wd)/7U + (wd == 0 ? 1 : 0));
}
{
g_return_if_fail (d != NULL);
g_return_if_fail (ndates != 0);
-
+
memset (d, 0x0, ndates*sizeof (GDate));
}
gchar num[4][NUM_LEN+1];
gint i;
const gchar *s;
-
+
/* We count 4, but store 3; so we can give an error
* if there are 4.
*/
pt->num_ints = 0;
while (*s && pt->num_ints < 4)
{
-
+
i = 0;
while (*s && isdigit (*s) && i <= NUM_LEN)
{
++s;
++i;
}
-
+
if (i > 0)
{
num[pt->num_ints][i] = '\0';
++(pt->num_ints);
}
-
+
if (*s == '\0') break;
-
+
++s;
}
pt->n[0] = pt->num_ints > 0 ? atoi (num[0]) : 0;
pt->n[1] = pt->num_ints > 1 ? atoi (num[1]) : 0;
pt->n[2] = pt->num_ints > 2 ? atoi (num[2]) : 0;
-
+
pt->month = G_DATE_BAD_MONTH;
-
+
if (pt->num_ints < 3)
{
gchar lcstr[128];
int i = 1;
-
+
strncpy (lcstr, str, 127);
g_strdown (lcstr);
-
+
while (i < 13)
{
if (long_month_names[i] != NULL)
{
const gchar *found = strstr (lcstr, long_month_names[i]);
-
+
if (found != NULL)
{
pt->month = i;
return;
}
}
-
+
if (short_month_names[i] != NULL)
{
const gchar *found = strstr (lcstr, short_month_names[i]);
-
+
if (found != NULL)
{
pt->month = i;
return;
}
}
-
+
++i;
}
}
const gchar *locale = setlocale (LC_TIME, NULL);
gboolean recompute_localeinfo = FALSE;
GDate d;
-
+
g_return_if_fail (locale != NULL); /* should not happen */
-
+
g_date_clear (&d, 1); /* clear for scratch use */
-
+
if ( (current_locale == NULL) || (strcmp (locale, current_locale) != 0) )
{
recompute_localeinfo = TRUE; /* Uh, there used to be a reason for the temporary */
int i = 1;
GDateParseTokens testpt;
gchar buf[128];
-
+
g_free (current_locale); /* still works if current_locale == NULL */
-
+
current_locale = g_strdup (locale);
-
+
while (i < 13)
{
g_date_set_mdy (&d, i, 1, 1);
-
+
g_return_if_fail (g_date_valid (&d));
-
+
g_date_strftime (buf, 127, "%b", &d);
g_free (short_month_names[i]);
g_strdown (buf);
short_month_names[i] = g_strdup (buf);
-
+
-
+
g_date_strftime (buf, 127, "%B", &d);
g_free (long_month_names[i]);
g_strdown (buf);
++i;
}
-
+
/* Determine MDY order */
-
+
g_date_set_mdy (&d, 7, 4, 1776); /* had to pick a random day */
g_date_strftime (buf, 127, "%x", &d);
}
++i;
}
-
+
#ifdef G_ENABLE_DEBUG
- g_print ("\n**GDate prepared a new set of locale-specific parse rules.\n");
+ g_message ("**GDate prepared a new set of locale-specific parse rules.");
i = 1;
while (i < 13)
{
- g_print (" %s %s\n", long_month_names[i], short_month_names[i]);
+ g_message (" %s %s", long_month_names[i], short_month_names[i]);
++i;
}
if (using_twodigit_years)
{
- g_print ("**Using twodigit years with cutoff year: %u\n", twodigit_start_year);
+ g_message ("**Using twodigit years with cutoff year: %u", twodigit_start_year);
}
{
gchar *strings[3];
}
++i;
}
- g_print ("**Order: %s, %s, %s\n", strings[0], strings[1], strings[2]);
- g_print ("**Sample date in this locale: `%s'\n\n", buf);
+ g_message ("**Order: %s, %s, %s", strings[0], strings[1], strings[2]);
+ g_message ("**Sample date in this locale: `%s'", buf);
}
#endif
}
-
+
g_date_fill_parse_tokens (str, pt);
}
{
GDateParseTokens pt;
guint m = G_DATE_BAD_MONTH, day = G_DATE_BAD_DAY, y = G_DATE_BAD_YEAR;
-
+
g_return_if_fail (d != NULL);
-
+
/* set invalid */
g_date_clear (d, 1);
-
+
g_date_prepare_to_parse (str, &pt);
-
+
#ifdef G_ENABLE_DEBUG
- g_print ("Found %d ints, `%d' `%d' `%d' and written out month %d\n",
- pt.num_ints, pt.n[0], pt.n[1], pt.n[2], pt.month);
+ g_message ("Found %d ints, `%d' `%d' `%d' and written out month %d",
+ pt.num_ints, pt.n[0], pt.n[1], pt.n[2], pt.month);
#endif
-
+
if (pt.num_ints == 4) return; /* presumably a typo; bail out. */
-
+
if (pt.num_ints > 1)
{
int i = 0;
int j = 0;
-
+
g_assert (pt.num_ints < 4); /* i.e., it is 2 or 3 */
-
+
while (i < pt.num_ints && j < 3)
{
switch (mdy_order[j])
{
case G_DATE_MONTH:
- {
- if (pt.num_ints == 2 && pt.month != G_DATE_BAD_MONTH)
- {
- m = pt.month;
- ++j; /* skip months, but don't skip this number */
- continue;
- }
- else
- m = pt.n[i];
- }
- break;
+ {
+ if (pt.num_ints == 2 && pt.month != G_DATE_BAD_MONTH)
+ {
+ m = pt.month;
+ ++j; /* skip months, but don't skip this number */
+ continue;
+ }
+ else
+ m = pt.n[i];
+ }
+ break;
case G_DATE_DAY:
- {
- if (pt.num_ints == 2 && pt.month == G_DATE_BAD_MONTH)
- {
- day = 1;
- ++j; /* skip days, since we may have month/year */
- continue;
- }
- day = pt.n[i];
- }
- break;
+ {
+ if (pt.num_ints == 2 && pt.month == G_DATE_BAD_MONTH)
+ {
+ day = 1;
+ ++j; /* skip days, since we may have month/year */
+ continue;
+ }
+ day = pt.n[i];
+ }
+ break;
case G_DATE_YEAR:
- {
- y = pt.n[i];
-
- if (using_twodigit_years && y < 100)
- {
- guint two = twodigit_start_year % 100;
- guint century = (twodigit_start_year / 100) * 100;
-
- if (y < two)
- century += 100;
-
- y += century;
- }
- }
- break;
+ {
+ y = pt.n[i];
+
+ if (using_twodigit_years && y < 100)
+ {
+ guint two = twodigit_start_year % 100;
+ guint century = (twodigit_start_year / 100) * 100;
+
+ if (y < two)
+ century += 100;
+
+ y += century;
+ }
+ }
+ break;
default:
break;
}
-
+
++i;
++j;
}
-
+
if (pt.num_ints == 3 && !g_date_valid_mdy (m, day, y))
{
/* Try YYYY MM DD */
else
{
/* Try yyyymmdd and yymmdd */
-
+
m = (pt.n[0]/100) % 100;
day = pt.n[0] % 100;
y = pt.n[0]/10000;
-
+
/* FIXME move this into a separate function */
if (using_twodigit_years && y < 100)
{
}
}
}
-
+
/* See if we got anything valid out of all this. */
/* y < 8000 is to catch 19998 style typos; the library is OK up to 65535 or so */
if (y < 8000 && g_date_valid_mdy (m, day, y))
}
#ifdef G_ENABLE_DEBUG
else
- g_print ("Rejected MDY %u %u %u\n", m, day, y);
+ g_message ("Rejected MDY %u %u %u", m, day, y);
#endif
}
void
-g_date_set_time (GDate *d, time_t t)
+g_date_set_time (GDate *d,
+ GTime time)
{
+ time_t t = time;
struct tm *tm;
-
+
g_return_if_fail (d != NULL);
tm = localtime (&t);
if (tm)
{
d->julian = FALSE;
-
+
d->month = tm->tm_mon + 1;
d->day = tm->tm_mday;
d->year = tm->tm_year + 1900;
-
+
g_return_if_fail (g_date_valid_mdy (d->month, d->day, d->year));
-
+
d->mdy = TRUE;
}
else
{
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid_month (m));
-
+
d->julian = FALSE;
d->month = m;
-
+
if (g_date_valid_mdy (d->month, d->day, d->year))
d->mdy = TRUE;
else
{
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid_day (day));
-
+
d->julian = FALSE;
d->day = day;
-
+
if (g_date_valid_mdy (d->month, d->day, d->year))
d->mdy = TRUE;
else
{
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid_year (y));
-
+
d->julian = FALSE;
d->year = y;
-
+
if (g_date_valid_mdy (d->month, d->day, d->year))
d->mdy = TRUE;
else
{
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid_mdy (m, day, y));
-
+
d->julian = FALSE;
d->month = m;
d->day = day;
d->year = y;
-
+
d->mdy = TRUE;
}
{
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid_julian (j));
-
+
d->julian_days = j;
d->julian = TRUE;
d->mdy = FALSE;
{
g_return_val_if_fail (d != NULL, FALSE);
g_return_val_if_fail (g_date_valid (d), FALSE);
-
+
if (!d->mdy)
{
g_date_update_mdy (d);
}
g_return_val_if_fail (d->mdy, FALSE);
-
+
if (d->day == 1) return TRUE;
else return FALSE;
}
g_date_is_last_of_month (GDate *d)
{
gint index;
-
+
g_return_val_if_fail (d != NULL, FALSE);
g_return_val_if_fail (g_date_valid (d), FALSE);
-
+
if (!d->mdy)
{
g_date_update_mdy (d);
}
g_return_val_if_fail (d->mdy, FALSE);
-
+
index = g_date_is_leap_year (d->year) ? 1 : 0;
-
+
if (d->day == days_in_months[index][d->month]) return TRUE;
else return FALSE;
}
{
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid (d));
-
+
if (!d->julian)
{
g_date_update_julian (d);
}
g_return_if_fail (d->julian);
-
+
d->julian_days += ndays;
d->mdy = FALSE;
}
{
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid (d));
-
+
if (!d->julian)
{
g_date_update_julian (d);
}
g_return_if_fail (d->julian);
g_return_if_fail (d->julian_days > ndays);
-
+
d->julian_days -= ndays;
d->mdy = FALSE;
}
{
guint years, months;
gint index;
-
+
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid (d));
g_date_update_mdy (d);
}
g_return_if_fail (d->mdy);
-
+
nmonths += d->month - 1;
-
+
years = nmonths/12;
months = nmonths%12;
-
+
d->month = months + 1;
d->year += years;
-
+
index = g_date_is_leap_year (d->year) ? 1 : 0;
-
+
if (d->day > days_in_months[index][d->month])
d->day = days_in_months[index][d->month];
-
+
d->julian = FALSE;
-
+
g_return_if_fail (g_date_valid (d));
}
{
guint years, months;
gint index;
-
+
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid (d));
g_date_update_mdy (d);
}
g_return_if_fail (d->mdy);
-
+
years = nmonths/12;
months = nmonths%12;
-
+
g_return_if_fail (d->year > years);
-
+
d->year -= years;
-
+
if (d->month > months) d->month -= months;
else
{
d->month = 12 - months;
d->year -= 1;
}
-
+
index = g_date_is_leap_year (d->year) ? 1 : 0;
-
+
if (d->day > days_in_months[index][d->month])
d->day = days_in_months[index][d->month];
-
+
d->julian = FALSE;
-
+
g_return_if_fail (g_date_valid (d));
}
g_date_update_mdy (d);
}
g_return_if_fail (d->mdy);
-
+
d->year += nyears;
-
+
if (d->month == 2 && d->day == 29)
{
if (!g_date_is_leap_year (d->year))
d->day = 28;
}
}
-
+
d->julian = FALSE;
}
}
g_return_if_fail (d->mdy);
g_return_if_fail (d->year > nyears);
-
+
d->year -= nyears;
-
+
if (d->month == 2 && d->day == 29)
{
if (!g_date_is_leap_year (d->year))
d->day = 28;
}
}
-
+
d->julian = FALSE;
}
g_date_is_leap_year (GDateYear year)
{
g_return_val_if_fail (g_date_valid_year (year), FALSE);
-
+
return ( (((year % 4) == 0) && ((year % 100) != 0)) ||
(year % 400) == 0 );
}
GDateYear year)
{
gint index;
-
+
g_return_val_if_fail (g_date_valid_year (year), 0);
g_return_val_if_fail (g_date_valid_month (month), 0);
index = g_date_is_leap_year (year) ? 1 : 0;
-
+
return days_in_months[index][month];
}
g_date_monday_weeks_in_year (GDateYear year)
{
GDate d;
-
+
g_return_val_if_fail (g_date_valid_year (year), 0);
-
+
g_date_clear (&d, 1);
g_date_set_mdy (&d, 1, 1, year);
if (g_date_weekday (&d) == G_DATE_MONDAY) return 53;
g_date_sunday_weeks_in_year (GDateYear year)
{
GDate d;
-
+
g_return_val_if_fail (g_date_valid_year (year), 0);
-
+
g_date_clear (&d, 1);
g_date_set_mdy (&d, 1, 1, year);
if (g_date_weekday (&d) == G_DATE_SUNDAY) return 53;
g_return_val_if_fail (rhs != NULL, 0);
g_return_val_if_fail (g_date_valid (lhs), 0);
g_return_val_if_fail (g_date_valid (rhs), 0);
-
+
/* Remember the self-comparison case! I think it works right now. */
-
+
while (TRUE)
{
-
+
if (lhs->julian && rhs->julian)
{
if (lhs->julian_days < rhs->julian_days) return -1;
g_return_val_if_fail (lhs->julian, 0);
g_return_val_if_fail (rhs->julian, 0);
}
-
+
}
return 0; /* warnings */
}
void
g_date_to_struct_tm (GDate *d,
- struct tm *tm)
+ gpointer struct_tm_p)
{
GDateWeekday day;
-
+ struct tm *tm;
+
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid (d));
- g_return_if_fail (tm != NULL);
+ g_return_if_fail (struct_tm_p != NULL);
+
+ tm = struct_tm_p;
if (!d->mdy)
{
g_date_update_mdy (d);
}
g_return_if_fail (d->mdy);
-
+
/* zero all the irrelevant fields to be sure they're valid */
-
+
/* On Linux and maybe other systems, there are weird non-POSIX
* fields on the end of struct tm that choke strftime if they
* contain garbage. So we need to 0 the entire struct, not just the
* fields we know to exist.
*/
-
+
memset (tm, 0x0, sizeof (struct tm));
-
+
tm->tm_mday = d->day;
tm->tm_mon = d->month - 1; /* 0-11 goes in tm */
tm->tm_year = ((int)d->year) - 1900; /* X/Open says tm_year can be negative */
-
+
day = g_date_weekday (d);
if (day == 7) day = 0; /* struct tm wants days since Sunday, so Sunday is 0 */
-
+
tm->tm_wday = (int)day;
tm->tm_yday = g_date_day_of_year (d) - 1; /* 0 to 365 */
{
struct tm tm;
gsize retval;
-
+
g_return_val_if_fail (d != NULL, 0);
g_return_val_if_fail (g_date_valid (d), 0);
g_return_val_if_fail (slen > 0, 0);
g_return_val_if_fail (format != 0, 0);
g_return_val_if_fail (s != 0, 0);
-
+
g_date_to_struct_tm (d, &tm);
-
+
retval = strftime (s, slen, format, &tm);
if (retval == 0)
{
* Pennington <hp@pobox.com>
*/
-#include <time.h>
-
/* this enum is used to specify order of appearance in parsed date
* strings
*/
const gchar *str);
void g_date_set_time (GDate *d,
- time_t t);
+ GTime time);
void g_date_set_month (GDate *d,
GDateMonth m);
void g_date_to_struct_tm (GDate *d,
- struct tm *tm);
+ gpointer struct_tm_p);
/* Just like strftime() except you can only use date-related formats.
* Using a time format is undefined.
*/
#include "glib.h"
+#include <time.h>
#include <string.h>
#include <ctype.h>
#include <stdlib.h>
g_return_val_if_fail (g_date_valid_mdy (m, day, y), NULL);
d = g_new (GDate, 1);
-
+
d->julian = FALSE;
d->mdy = TRUE;
-
+
d->month = m;
d->day = day;
d->year = y;
g_assert (g_date_valid (d));
-
+
return d;
}
g_return_val_if_fail (g_date_valid_julian (j), NULL);
d = g_new (GDate, 1);
-
+
d->julian = TRUE;
d->mdy = FALSE;
-
+
d->julian_days = j;
g_assert (g_date_valid (d));
-
+
return d;
}
g_date_free (GDate *d)
{
g_return_if_fail (d != NULL);
-
+
g_free (d);
}
g_date_valid (GDate *d)
{
g_return_val_if_fail (d != NULL, FALSE);
-
+
if (d->julian && d->mdy)
{
return ( g_date_valid_julian (d->julian_days) &&
g_date_valid_mdy (d->month, d->day, d->year) );
-
+
}
else if (d->mdy)
{
gboolean
g_date_valid_mdy (GDateMonth m,
- GDateDay d,
- GDateYear y)
+ GDateDay d,
+ GDateYear y)
{
return ( (m > G_DATE_BAD_MONTH) &&
(m < 13) &&
(d > G_DATE_BAD_DAY) &&
(y > G_DATE_BAD_YEAR) && /* must check before using g_date_is_leap_year */
(d <= (g_date_is_leap_year (y) ?
- days_in_months[1][m] : days_in_months[0][m])) );
+ days_in_months[1][m] : days_in_months[0][m])) );
}
{
GDateYear year;
gint index;
-
+
g_return_if_fail (d != NULL);
g_return_if_fail (d->mdy);
g_return_if_fail (!d->julian);
g_return_if_fail (g_date_valid_mdy (d->month, d->day, d->year));
-
+
/* What we actually do is: multiply years * 365 days in the year,
* add the number of years divided by 4, subtract the number of
* years divided by 100 and add the number of years divided by 400,
* which accounts for leap year stuff. Code from Steffen Beyer's
* DateCalc.
*/
-
+
year = d->year - 1; /* we know d->year > 0 since it's valid */
-
+
d->julian_days = year * 365U;
d->julian_days += (year >>= 2); /* divide by 4 and add */
d->julian_days -= (year /= 25); /* divides original # years by 100 */
d->julian_days += year >> 2; /* divides by 4, which divides original by 400 */
-
+
index = g_date_is_leap_year (d->year) ? 1 : 0;
-
+
d->julian_days += days_in_year[index][d->month] + d->day;
-
+
g_return_if_fail (g_date_valid_julian (d->julian_days));
-
+
d->julian = TRUE;
}
GDateYear y;
GDateMonth m;
GDateDay day;
-
+
guint32 A, B, C, D, E, M;
-
+
g_return_if_fail (d != NULL);
g_return_if_fail (d->julian);
g_return_if_fail (!d->mdy);
g_return_if_fail (g_date_valid_julian (d->julian_days));
-
+
/* Formula taken from the Calendar FAQ; the formula was for the
* Julian Period which starts on 1 January 4713 BC, so we add
* 1,721,425 to the number of days before doing the formula.
* I'm sure this can be simplified for our 1 January 1 AD period
* start, but I can't figure out how to unpack the formula.
*/
-
+
A = d->julian_days + 1721425 + 32045;
B = ( 4 *(A + 36524) )/ 146097 - 1;
C = A - (146097 * B)/4;
m = M + 3 - (12*(M/10));
day = E - (153*M + 2)/5;
y = 100 * B + D - 4800 + (M/10);
-
+
#ifdef G_ENABLE_DEBUG
if (!g_date_valid_mdy (m, day, y))
{
g_warning ("\nOOPS julian: %u computed mdy: %u %u %u\n",
- d->julian_days, m, day, y);
+ d->julian_days, m, day, y);
}
#endif
-
+
d->month = m;
d->day = day;
d->year = y;
-
+
d->mdy = TRUE;
}
{
g_return_val_if_fail (d != NULL, G_DATE_BAD_WEEKDAY);
g_return_val_if_fail (g_date_valid (d), G_DATE_BAD_WEEKDAY);
-
+
if (!d->julian)
{
g_date_update_julian (d);
}
g_return_val_if_fail (d->julian, G_DATE_BAD_WEEKDAY);
-
+
return ((d->julian_days - 1) % 7) + 1;
}
{
g_return_val_if_fail (d != NULL, G_DATE_BAD_MONTH);
g_return_val_if_fail (g_date_valid (d), G_DATE_BAD_MONTH);
-
+
if (!d->mdy)
{
g_date_update_mdy (d);
{
g_return_val_if_fail (d != NULL, G_DATE_BAD_YEAR);
g_return_val_if_fail (g_date_valid (d), G_DATE_BAD_YEAR);
-
+
if (!d->mdy)
{
g_date_update_mdy (d);
}
g_return_val_if_fail (d->mdy, G_DATE_BAD_YEAR);
-
+
return d->year;
}
{
g_return_val_if_fail (d != NULL, G_DATE_BAD_DAY);
g_return_val_if_fail (g_date_valid (d), G_DATE_BAD_DAY);
-
+
if (!d->mdy)
{
g_date_update_mdy (d);
{
g_return_val_if_fail (d != NULL, G_DATE_BAD_JULIAN);
g_return_val_if_fail (g_date_valid (d), G_DATE_BAD_JULIAN);
-
+
if (!d->julian)
{
g_date_update_julian (d);
g_date_day_of_year (GDate *d)
{
gint index;
-
+
g_return_val_if_fail (d != NULL, 0);
g_return_val_if_fail (g_date_valid (d), 0);
-
+
if (!d->mdy)
{
g_date_update_mdy (d);
}
g_return_val_if_fail (d->mdy, 0);
-
+
index = g_date_is_leap_year (d->year) ? 1 : 0;
return (days_in_year[index][d->month] + d->day);
GDateWeekday wd;
guint day;
GDate first;
-
+
g_return_val_if_fail (d != NULL, 0);
g_return_val_if_fail (g_date_valid (d), 0);
-
+
if (!d->mdy)
{
g_date_update_mdy (d);
}
g_return_val_if_fail (d->mdy, 0);
-
+
g_date_clear (&first, 1);
-
+
g_date_set_mdy (&first, 1, 1, d->year);
-
+
wd = g_date_weekday (&first) - 1; /* make Monday day 0 */
day = g_date_day_of_year (d) - 1;
-
+
return ((day + wd)/7U + (wd == 0 ? 1 : 0));
}
GDateWeekday wd;
guint day;
GDate first;
-
+
g_return_val_if_fail (d != NULL, 0);
g_return_val_if_fail (g_date_valid (d), 0);
-
+
if (!d->mdy)
{
g_date_update_mdy (d);
}
g_return_val_if_fail (d->mdy, 0);
-
+
g_date_clear (&first, 1);
-
+
g_date_set_mdy (&first, 1, 1, d->year);
-
+
wd = g_date_weekday (&first);
if (wd == 7) wd = 0; /* make Sunday day 0 */
day = g_date_day_of_year (d) - 1;
-
+
return ((day + wd)/7U + (wd == 0 ? 1 : 0));
}
{
g_return_if_fail (d != NULL);
g_return_if_fail (ndates != 0);
-
+
memset (d, 0x0, ndates*sizeof (GDate));
}
gchar num[4][NUM_LEN+1];
gint i;
const gchar *s;
-
+
/* We count 4, but store 3; so we can give an error
* if there are 4.
*/
pt->num_ints = 0;
while (*s && pt->num_ints < 4)
{
-
+
i = 0;
while (*s && isdigit (*s) && i <= NUM_LEN)
{
++s;
++i;
}
-
+
if (i > 0)
{
num[pt->num_ints][i] = '\0';
++(pt->num_ints);
}
-
+
if (*s == '\0') break;
-
+
++s;
}
pt->n[0] = pt->num_ints > 0 ? atoi (num[0]) : 0;
pt->n[1] = pt->num_ints > 1 ? atoi (num[1]) : 0;
pt->n[2] = pt->num_ints > 2 ? atoi (num[2]) : 0;
-
+
pt->month = G_DATE_BAD_MONTH;
-
+
if (pt->num_ints < 3)
{
gchar lcstr[128];
int i = 1;
-
+
strncpy (lcstr, str, 127);
g_strdown (lcstr);
-
+
while (i < 13)
{
if (long_month_names[i] != NULL)
{
const gchar *found = strstr (lcstr, long_month_names[i]);
-
+
if (found != NULL)
{
pt->month = i;
return;
}
}
-
+
if (short_month_names[i] != NULL)
{
const gchar *found = strstr (lcstr, short_month_names[i]);
-
+
if (found != NULL)
{
pt->month = i;
return;
}
}
-
+
++i;
}
}
const gchar *locale = setlocale (LC_TIME, NULL);
gboolean recompute_localeinfo = FALSE;
GDate d;
-
+
g_return_if_fail (locale != NULL); /* should not happen */
-
+
g_date_clear (&d, 1); /* clear for scratch use */
-
+
if ( (current_locale == NULL) || (strcmp (locale, current_locale) != 0) )
{
recompute_localeinfo = TRUE; /* Uh, there used to be a reason for the temporary */
int i = 1;
GDateParseTokens testpt;
gchar buf[128];
-
+
g_free (current_locale); /* still works if current_locale == NULL */
-
+
current_locale = g_strdup (locale);
-
+
while (i < 13)
{
g_date_set_mdy (&d, i, 1, 1);
-
+
g_return_if_fail (g_date_valid (&d));
-
+
g_date_strftime (buf, 127, "%b", &d);
g_free (short_month_names[i]);
g_strdown (buf);
short_month_names[i] = g_strdup (buf);
-
+
-
+
g_date_strftime (buf, 127, "%B", &d);
g_free (long_month_names[i]);
g_strdown (buf);
++i;
}
-
+
/* Determine MDY order */
-
+
g_date_set_mdy (&d, 7, 4, 1776); /* had to pick a random day */
g_date_strftime (buf, 127, "%x", &d);
}
++i;
}
-
+
#ifdef G_ENABLE_DEBUG
- g_print ("\n**GDate prepared a new set of locale-specific parse rules.\n");
+ g_message ("**GDate prepared a new set of locale-specific parse rules.");
i = 1;
while (i < 13)
{
- g_print (" %s %s\n", long_month_names[i], short_month_names[i]);
+ g_message (" %s %s", long_month_names[i], short_month_names[i]);
++i;
}
if (using_twodigit_years)
{
- g_print ("**Using twodigit years with cutoff year: %u\n", twodigit_start_year);
+ g_message ("**Using twodigit years with cutoff year: %u", twodigit_start_year);
}
{
gchar *strings[3];
}
++i;
}
- g_print ("**Order: %s, %s, %s\n", strings[0], strings[1], strings[2]);
- g_print ("**Sample date in this locale: `%s'\n\n", buf);
+ g_message ("**Order: %s, %s, %s", strings[0], strings[1], strings[2]);
+ g_message ("**Sample date in this locale: `%s'", buf);
}
#endif
}
-
+
g_date_fill_parse_tokens (str, pt);
}
{
GDateParseTokens pt;
guint m = G_DATE_BAD_MONTH, day = G_DATE_BAD_DAY, y = G_DATE_BAD_YEAR;
-
+
g_return_if_fail (d != NULL);
-
+
/* set invalid */
g_date_clear (d, 1);
-
+
g_date_prepare_to_parse (str, &pt);
-
+
#ifdef G_ENABLE_DEBUG
- g_print ("Found %d ints, `%d' `%d' `%d' and written out month %d\n",
- pt.num_ints, pt.n[0], pt.n[1], pt.n[2], pt.month);
+ g_message ("Found %d ints, `%d' `%d' `%d' and written out month %d",
+ pt.num_ints, pt.n[0], pt.n[1], pt.n[2], pt.month);
#endif
-
+
if (pt.num_ints == 4) return; /* presumably a typo; bail out. */
-
+
if (pt.num_ints > 1)
{
int i = 0;
int j = 0;
-
+
g_assert (pt.num_ints < 4); /* i.e., it is 2 or 3 */
-
+
while (i < pt.num_ints && j < 3)
{
switch (mdy_order[j])
{
case G_DATE_MONTH:
- {
- if (pt.num_ints == 2 && pt.month != G_DATE_BAD_MONTH)
- {
- m = pt.month;
- ++j; /* skip months, but don't skip this number */
- continue;
- }
- else
- m = pt.n[i];
- }
- break;
+ {
+ if (pt.num_ints == 2 && pt.month != G_DATE_BAD_MONTH)
+ {
+ m = pt.month;
+ ++j; /* skip months, but don't skip this number */
+ continue;
+ }
+ else
+ m = pt.n[i];
+ }
+ break;
case G_DATE_DAY:
- {
- if (pt.num_ints == 2 && pt.month == G_DATE_BAD_MONTH)
- {
- day = 1;
- ++j; /* skip days, since we may have month/year */
- continue;
- }
- day = pt.n[i];
- }
- break;
+ {
+ if (pt.num_ints == 2 && pt.month == G_DATE_BAD_MONTH)
+ {
+ day = 1;
+ ++j; /* skip days, since we may have month/year */
+ continue;
+ }
+ day = pt.n[i];
+ }
+ break;
case G_DATE_YEAR:
- {
- y = pt.n[i];
-
- if (using_twodigit_years && y < 100)
- {
- guint two = twodigit_start_year % 100;
- guint century = (twodigit_start_year / 100) * 100;
-
- if (y < two)
- century += 100;
-
- y += century;
- }
- }
- break;
+ {
+ y = pt.n[i];
+
+ if (using_twodigit_years && y < 100)
+ {
+ guint two = twodigit_start_year % 100;
+ guint century = (twodigit_start_year / 100) * 100;
+
+ if (y < two)
+ century += 100;
+
+ y += century;
+ }
+ }
+ break;
default:
break;
}
-
+
++i;
++j;
}
-
+
if (pt.num_ints == 3 && !g_date_valid_mdy (m, day, y))
{
/* Try YYYY MM DD */
else
{
/* Try yyyymmdd and yymmdd */
-
+
m = (pt.n[0]/100) % 100;
day = pt.n[0] % 100;
y = pt.n[0]/10000;
-
+
/* FIXME move this into a separate function */
if (using_twodigit_years && y < 100)
{
}
}
}
-
+
/* See if we got anything valid out of all this. */
/* y < 8000 is to catch 19998 style typos; the library is OK up to 65535 or so */
if (y < 8000 && g_date_valid_mdy (m, day, y))
}
#ifdef G_ENABLE_DEBUG
else
- g_print ("Rejected MDY %u %u %u\n", m, day, y);
+ g_message ("Rejected MDY %u %u %u", m, day, y);
#endif
}
void
-g_date_set_time (GDate *d, time_t t)
+g_date_set_time (GDate *d,
+ GTime time)
{
+ time_t t = time;
struct tm *tm;
-
+
g_return_if_fail (d != NULL);
tm = localtime (&t);
if (tm)
{
d->julian = FALSE;
-
+
d->month = tm->tm_mon + 1;
d->day = tm->tm_mday;
d->year = tm->tm_year + 1900;
-
+
g_return_if_fail (g_date_valid_mdy (d->month, d->day, d->year));
-
+
d->mdy = TRUE;
}
else
{
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid_month (m));
-
+
d->julian = FALSE;
d->month = m;
-
+
if (g_date_valid_mdy (d->month, d->day, d->year))
d->mdy = TRUE;
else
{
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid_day (day));
-
+
d->julian = FALSE;
d->day = day;
-
+
if (g_date_valid_mdy (d->month, d->day, d->year))
d->mdy = TRUE;
else
{
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid_year (y));
-
+
d->julian = FALSE;
d->year = y;
-
+
if (g_date_valid_mdy (d->month, d->day, d->year))
d->mdy = TRUE;
else
{
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid_mdy (m, day, y));
-
+
d->julian = FALSE;
d->month = m;
d->day = day;
d->year = y;
-
+
d->mdy = TRUE;
}
{
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid_julian (j));
-
+
d->julian_days = j;
d->julian = TRUE;
d->mdy = FALSE;
{
g_return_val_if_fail (d != NULL, FALSE);
g_return_val_if_fail (g_date_valid (d), FALSE);
-
+
if (!d->mdy)
{
g_date_update_mdy (d);
}
g_return_val_if_fail (d->mdy, FALSE);
-
+
if (d->day == 1) return TRUE;
else return FALSE;
}
g_date_is_last_of_month (GDate *d)
{
gint index;
-
+
g_return_val_if_fail (d != NULL, FALSE);
g_return_val_if_fail (g_date_valid (d), FALSE);
-
+
if (!d->mdy)
{
g_date_update_mdy (d);
}
g_return_val_if_fail (d->mdy, FALSE);
-
+
index = g_date_is_leap_year (d->year) ? 1 : 0;
-
+
if (d->day == days_in_months[index][d->month]) return TRUE;
else return FALSE;
}
{
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid (d));
-
+
if (!d->julian)
{
g_date_update_julian (d);
}
g_return_if_fail (d->julian);
-
+
d->julian_days += ndays;
d->mdy = FALSE;
}
{
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid (d));
-
+
if (!d->julian)
{
g_date_update_julian (d);
}
g_return_if_fail (d->julian);
g_return_if_fail (d->julian_days > ndays);
-
+
d->julian_days -= ndays;
d->mdy = FALSE;
}
{
guint years, months;
gint index;
-
+
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid (d));
g_date_update_mdy (d);
}
g_return_if_fail (d->mdy);
-
+
nmonths += d->month - 1;
-
+
years = nmonths/12;
months = nmonths%12;
-
+
d->month = months + 1;
d->year += years;
-
+
index = g_date_is_leap_year (d->year) ? 1 : 0;
-
+
if (d->day > days_in_months[index][d->month])
d->day = days_in_months[index][d->month];
-
+
d->julian = FALSE;
-
+
g_return_if_fail (g_date_valid (d));
}
{
guint years, months;
gint index;
-
+
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid (d));
g_date_update_mdy (d);
}
g_return_if_fail (d->mdy);
-
+
years = nmonths/12;
months = nmonths%12;
-
+
g_return_if_fail (d->year > years);
-
+
d->year -= years;
-
+
if (d->month > months) d->month -= months;
else
{
d->month = 12 - months;
d->year -= 1;
}
-
+
index = g_date_is_leap_year (d->year) ? 1 : 0;
-
+
if (d->day > days_in_months[index][d->month])
d->day = days_in_months[index][d->month];
-
+
d->julian = FALSE;
-
+
g_return_if_fail (g_date_valid (d));
}
g_date_update_mdy (d);
}
g_return_if_fail (d->mdy);
-
+
d->year += nyears;
-
+
if (d->month == 2 && d->day == 29)
{
if (!g_date_is_leap_year (d->year))
d->day = 28;
}
}
-
+
d->julian = FALSE;
}
}
g_return_if_fail (d->mdy);
g_return_if_fail (d->year > nyears);
-
+
d->year -= nyears;
-
+
if (d->month == 2 && d->day == 29)
{
if (!g_date_is_leap_year (d->year))
d->day = 28;
}
}
-
+
d->julian = FALSE;
}
g_date_is_leap_year (GDateYear year)
{
g_return_val_if_fail (g_date_valid_year (year), FALSE);
-
+
return ( (((year % 4) == 0) && ((year % 100) != 0)) ||
(year % 400) == 0 );
}
GDateYear year)
{
gint index;
-
+
g_return_val_if_fail (g_date_valid_year (year), 0);
g_return_val_if_fail (g_date_valid_month (month), 0);
index = g_date_is_leap_year (year) ? 1 : 0;
-
+
return days_in_months[index][month];
}
g_date_monday_weeks_in_year (GDateYear year)
{
GDate d;
-
+
g_return_val_if_fail (g_date_valid_year (year), 0);
-
+
g_date_clear (&d, 1);
g_date_set_mdy (&d, 1, 1, year);
if (g_date_weekday (&d) == G_DATE_MONDAY) return 53;
g_date_sunday_weeks_in_year (GDateYear year)
{
GDate d;
-
+
g_return_val_if_fail (g_date_valid_year (year), 0);
-
+
g_date_clear (&d, 1);
g_date_set_mdy (&d, 1, 1, year);
if (g_date_weekday (&d) == G_DATE_SUNDAY) return 53;
g_return_val_if_fail (rhs != NULL, 0);
g_return_val_if_fail (g_date_valid (lhs), 0);
g_return_val_if_fail (g_date_valid (rhs), 0);
-
+
/* Remember the self-comparison case! I think it works right now. */
-
+
while (TRUE)
{
-
+
if (lhs->julian && rhs->julian)
{
if (lhs->julian_days < rhs->julian_days) return -1;
g_return_val_if_fail (lhs->julian, 0);
g_return_val_if_fail (rhs->julian, 0);
}
-
+
}
return 0; /* warnings */
}
void
g_date_to_struct_tm (GDate *d,
- struct tm *tm)
+ gpointer struct_tm_p)
{
GDateWeekday day;
-
+ struct tm *tm;
+
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid (d));
- g_return_if_fail (tm != NULL);
+ g_return_if_fail (struct_tm_p != NULL);
+
+ tm = struct_tm_p;
if (!d->mdy)
{
g_date_update_mdy (d);
}
g_return_if_fail (d->mdy);
-
+
/* zero all the irrelevant fields to be sure they're valid */
-
+
/* On Linux and maybe other systems, there are weird non-POSIX
* fields on the end of struct tm that choke strftime if they
* contain garbage. So we need to 0 the entire struct, not just the
* fields we know to exist.
*/
-
+
memset (tm, 0x0, sizeof (struct tm));
-
+
tm->tm_mday = d->day;
tm->tm_mon = d->month - 1; /* 0-11 goes in tm */
tm->tm_year = ((int)d->year) - 1900; /* X/Open says tm_year can be negative */
-
+
day = g_date_weekday (d);
if (day == 7) day = 0; /* struct tm wants days since Sunday, so Sunday is 0 */
-
+
tm->tm_wday = (int)day;
tm->tm_yday = g_date_day_of_year (d) - 1; /* 0 to 365 */
{
struct tm tm;
gsize retval;
-
+
g_return_val_if_fail (d != NULL, 0);
g_return_val_if_fail (g_date_valid (d), 0);
g_return_val_if_fail (slen > 0, 0);
g_return_val_if_fail (format != 0, 0);
g_return_val_if_fail (s != 0, 0);
-
+
g_date_to_struct_tm (d, &tm);
-
+
retval = strftime (s, slen, format, &tm);
if (retval == 0)
{
* Pennington <hp@pobox.com>
*/
-#include <time.h>
-
/* this enum is used to specify order of appearance in parsed date
* strings
*/
const gchar *str);
void g_date_set_time (GDate *d,
- time_t t);
+ GTime time);
void g_date_set_month (GDate *d,
GDateMonth m);
void g_date_to_struct_tm (GDate *d,
- struct tm *tm);
+ gpointer struct_tm_p);
/* Just like strftime() except you can only use date-related formats.
* Using a time format is undefined.
projects / platform / upstream / glib.git / commitdiff