* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+
+/*
+ * MT safe
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "glib.h"
#include <time.h>
}
GDate*
-g_date_new_mdy (GDateMonth m, GDateDay day, GDateYear y)
+g_date_new_dmy (GDateDay day, GDateMonth m, GDateYear y)
{
GDate *d;
- g_return_val_if_fail (g_date_valid_mdy (m, day, y), NULL);
+ g_return_val_if_fail (g_date_valid_dmy (day, m, y), NULL);
d = g_new (GDate, 1);
d->julian = FALSE;
- d->mdy = TRUE;
+ d->dmy = TRUE;
d->month = m;
d->day = day;
d = g_new (GDate, 1);
d->julian = TRUE;
- d->mdy = FALSE;
+ d->dmy = FALSE;
d->julian_days = j;
g_free (d);
}
-
-
gboolean
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)
- {
- return g_date_valid_mdy (d->month, d->day, d->year);
- }
- else if (d->julian)
- {
- return g_date_valid_julian (d->julian_days);
- }
- else
- return FALSE;
+ return (d->julian || d->dmy);
}
static const guint8 days_in_months[2][13] =
}
gboolean
-g_date_valid_mdy (GDateMonth m,
- GDateDay d,
+g_date_valid_dmy (GDateDay d,
+ GDateMonth m,
GDateYear y)
{
return ( (m > G_DATE_BAD_MONTH) &&
gint index;
g_return_if_fail (d != NULL);
- g_return_if_fail (d->mdy);
+ g_return_if_fail (d->dmy);
g_return_if_fail (!d->julian);
- g_return_if_fail (g_date_valid_mdy (d->month, d->day, d->year));
+ g_return_if_fail (g_date_valid_dmy (d->day, d->month, 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
}
static void
-g_date_update_mdy (GDate *d)
+g_date_update_dmy (GDate *d)
{
GDateYear y;
GDateMonth m;
g_return_if_fail (d != NULL);
g_return_if_fail (d->julian);
- g_return_if_fail (!d->mdy);
+ g_return_if_fail (!d->dmy);
g_return_if_fail (g_date_valid_julian (d->julian_days));
/* Formula taken from the Calendar FAQ; the formula was for the
y = 100 * B + D - 4800 + (M/10);
#ifdef G_ENABLE_DEBUG
- if (!g_date_valid_mdy (m, day, y))
+ if (!g_date_valid_dmy (day, m, y))
{
- g_warning ("\nOOPS julian: %u computed mdy: %u %u %u\n",
- d->julian_days, m, day, y);
+ g_warning ("\nOOPS julian: %u computed dmy: %u %u %u\n",
+ d->julian_days, day, m, y);
}
#endif
d->day = day;
d->year = y;
- d->mdy = TRUE;
+ d->dmy = TRUE;
}
GDateWeekday
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)
+ if (!d->dmy)
{
- g_date_update_mdy (d);
+ g_date_update_dmy (d);
}
- g_return_val_if_fail (d->mdy, G_DATE_BAD_MONTH);
+ g_return_val_if_fail (d->dmy, G_DATE_BAD_MONTH);
return d->month;
}
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)
+ if (!d->dmy)
{
- g_date_update_mdy (d);
+ g_date_update_dmy (d);
}
- g_return_val_if_fail (d->mdy, G_DATE_BAD_YEAR);
+ g_return_val_if_fail (d->dmy, 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)
+ if (!d->dmy)
{
- g_date_update_mdy (d);
+ g_date_update_dmy (d);
}
- g_return_val_if_fail (d->mdy, G_DATE_BAD_DAY);
+ g_return_val_if_fail (d->dmy, G_DATE_BAD_DAY);
return d->day;
}
g_return_val_if_fail (d != NULL, 0);
g_return_val_if_fail (g_date_valid (d), 0);
- if (!d->mdy)
+ if (!d->dmy)
{
- g_date_update_mdy (d);
+ g_date_update_dmy (d);
}
- g_return_val_if_fail (d->mdy, 0);
+ g_return_val_if_fail (d->dmy, 0);
index = g_date_is_leap_year (d->year) ? 1 : 0;
g_return_val_if_fail (d != NULL, 0);
g_return_val_if_fail (g_date_valid (d), 0);
- if (!d->mdy)
+ if (!d->dmy)
{
- g_date_update_mdy (d);
+ g_date_update_dmy (d);
}
- g_return_val_if_fail (d->mdy, 0);
+ g_return_val_if_fail (d->dmy, 0);
g_date_clear (&first, 1);
- g_date_set_mdy (&first, 1, 1, d->year);
+ g_date_set_dmy (&first, 1, 1, d->year);
wd = g_date_weekday (&first) - 1; /* make Monday day 0 */
day = g_date_day_of_year (d) - 1;
g_return_val_if_fail (d != NULL, 0);
g_return_val_if_fail (g_date_valid (d), 0);
- if (!d->mdy)
+ if (!d->dmy)
{
- g_date_update_mdy (d);
+ g_date_update_dmy (d);
}
- g_return_val_if_fail (d->mdy, 0);
+ g_return_val_if_fail (d->dmy, 0);
g_date_clear (&first, 1);
- g_date_set_mdy (&first, 1, 1, d->year);
+ g_date_set_dmy (&first, 1, 1, d->year);
wd = g_date_weekday (&first);
if (wd == 7) wd = 0; /* make Sunday day 0 */
memset (d, 0x0, ndates*sizeof (GDate));
}
+G_LOCK_DECLARE_STATIC (g_date_global);
+
/* These are for the parser, output to the user should use *
* g_date_strftime () - this creates more never-freed memory to annoy
* all those memory debugger users. :-)
static gchar *current_locale = NULL;
/* order of these in the current locale */
-static GDateMDY mdy_order[3] =
+static GDateDMY dmy_order[3] =
{
- G_DATE_MONTH, G_DATE_DAY, G_DATE_YEAR
+ G_DATE_DAY, G_DATE_MONTH, G_DATE_YEAR
};
/* Where to chop two-digit years: i.e., for the 1930 default, numbers
#define NUM_LEN 10
+/* HOLDS: g_date_global_lock */
static void
g_date_fill_parse_tokens (const gchar *str, GDateParseTokens *pt)
{
if (found != NULL)
{
pt->month = i;
- return;
+ return;
}
}
return;
}
}
-
+
++i;
- }
+ }
}
}
+/* HOLDS: g_date_global_lock */
static void
g_date_prepare_to_parse (const gchar *str, GDateParseTokens *pt)
{
while (i < 13)
{
- g_date_set_mdy (&d, i, 1, 1);
+ g_date_set_dmy (&d, 1, i, 1);
g_return_if_fail (g_date_valid (&d));
++i;
}
- /* Determine MDY order */
+ /* Determine DMY order */
- g_date_set_mdy (&d, 7, 4, 1776); /* had to pick a random day */
+ /* had to pick a random day - don't change this, some strftimes
+ * are broken on some days, and this one is good so far. */
+ g_date_set_dmy (&d, 4, 7, 1976);
g_date_strftime (buf, 127, "%x", &d);
switch (testpt.n[i])
{
case 7:
- mdy_order[i] = G_DATE_MONTH;
+ dmy_order[i] = G_DATE_MONTH;
break;
case 4:
- mdy_order[i] = G_DATE_DAY;
+ dmy_order[i] = G_DATE_DAY;
break;
case 76:
using_twodigit_years = TRUE; /* FALL THRU */
- case 1776:
- mdy_order[i] = G_DATE_YEAR;
+ case 1976:
+ dmy_order[i] = G_DATE_YEAR;
break;
default:
/* leave it unchanged */
i = 0;
while (i < 3)
{
- switch (mdy_order[i])
+ switch (dmy_order[i])
{
case G_DATE_MONTH:
strings[i] = "Month";
/* set invalid */
g_date_clear (d, 1);
+ G_LOCK (g_date_global);
+
g_date_prepare_to_parse (str, &pt);
#ifdef G_ENABLE_DEBUG
#endif
- if (pt.num_ints == 4) return; /* presumably a typo; bail out. */
+ if (pt.num_ints == 4)
+ {
+ G_UNLOCK (g_date_global);
+ return; /* presumably a typo; bail out. */
+ }
if (pt.num_ints > 1)
{
while (i < pt.num_ints && j < 3)
{
- switch (mdy_order[j])
+ switch (dmy_order[j])
{
case G_DATE_MONTH:
{
}
- if (pt.num_ints == 3 && !g_date_valid_mdy (m, day, y))
+ if (pt.num_ints == 3 && !g_date_valid_dmy (day, m, y))
{
/* Try YYYY MM DD */
y = pt.n[0];
/* 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))
+ if (y < 8000 && g_date_valid_dmy (day, m, y))
{
d->month = m;
d->day = day;
d->year = y;
- d->mdy = TRUE;
+ d->dmy = TRUE;
}
#ifdef G_ENABLE_DEBUG
else
- g_message ("Rejected MDY %u %u %u", m, day, y);
+ g_message ("Rejected DMY %u %u %u", day, m, y);
#endif
+ G_UNLOCK (g_date_global);
}
void
GTime time)
{
time_t t = time;
- struct tm *tm;
+ struct tm tm;
g_return_if_fail (d != NULL);
- tm = localtime (&t);
+#ifdef HAVE_LOCALTIME_R
+ localtime_r (&t, &tm);
+#else
+# ifdef G_THREADS_ENABLED
+# warning "the `g_date_set_time' function will not be MT-safe"
+# warning "because there is no `localtime_r' on your system."
+# endif
+ {
+ struct tm *ptm = localtime (&t);
+ g_assert (ptm);
+ memcpy ((void *) &tm, (void *) ptm, sizeof(struct tm));
+ }
+#endif
- 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_date_clear (d, 1);
- }
+ 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_dmy (d->day, d->month, d->year));
+
+ d->dmy = TRUE;
}
void
{
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid_month (m));
-
+
+ if (d->julian && !d->dmy) g_date_update_dmy(d);
d->julian = FALSE;
d->month = m;
- if (g_date_valid_mdy (d->month, d->day, d->year))
- d->mdy = TRUE;
+ if (g_date_valid_dmy (d->day, d->month, d->year))
+ d->dmy = TRUE;
else
- d->mdy = FALSE;
+ d->dmy = FALSE;
}
void
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid_day (day));
+ if (d->julian && !d->dmy) g_date_update_dmy(d);
d->julian = FALSE;
d->day = day;
- if (g_date_valid_mdy (d->month, d->day, d->year))
- d->mdy = TRUE;
+ if (g_date_valid_dmy (d->day, d->month, d->year))
+ d->dmy = TRUE;
else
- d->mdy = FALSE;
+ d->dmy = FALSE;
}
void
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid_year (y));
+ if (d->julian && !d->dmy) g_date_update_dmy(d);
d->julian = FALSE;
d->year = y;
- if (g_date_valid_mdy (d->month, d->day, d->year))
- d->mdy = TRUE;
+ if (g_date_valid_dmy (d->day, d->month, d->year))
+ d->dmy = TRUE;
else
- d->mdy = FALSE;
+ d->dmy = FALSE;
}
void
-g_date_set_mdy (GDate *d,
- GDateMonth m,
+g_date_set_dmy (GDate *d,
GDateDay day,
+ GDateMonth m,
GDateYear y)
{
g_return_if_fail (d != NULL);
- g_return_if_fail (g_date_valid_mdy (m, day, y));
+ g_return_if_fail (g_date_valid_dmy (day, m, y));
d->julian = FALSE;
d->day = day;
d->year = y;
- d->mdy = TRUE;
+ d->dmy = TRUE;
}
void
d->julian_days = j;
d->julian = TRUE;
- d->mdy = FALSE;
+ d->dmy = FALSE;
}
g_return_val_if_fail (d != NULL, FALSE);
g_return_val_if_fail (g_date_valid (d), FALSE);
- if (!d->mdy)
+ if (!d->dmy)
{
- g_date_update_mdy (d);
+ g_date_update_dmy (d);
}
- g_return_val_if_fail (d->mdy, FALSE);
+ g_return_val_if_fail (d->dmy, FALSE);
if (d->day == 1) return TRUE;
else return FALSE;
g_return_val_if_fail (d != NULL, FALSE);
g_return_val_if_fail (g_date_valid (d), FALSE);
- if (!d->mdy)
+ if (!d->dmy)
{
- g_date_update_mdy (d);
+ g_date_update_dmy (d);
}
- g_return_val_if_fail (d->mdy, FALSE);
+ g_return_val_if_fail (d->dmy, FALSE);
index = g_date_is_leap_year (d->year) ? 1 : 0;
g_return_if_fail (d->julian);
d->julian_days += ndays;
- d->mdy = FALSE;
+ d->dmy = FALSE;
}
void
g_return_if_fail (d->julian_days > ndays);
d->julian_days -= ndays;
- d->mdy = FALSE;
+ d->dmy = FALSE;
}
void
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid (d));
- if (!d->mdy)
+ if (!d->dmy)
{
- g_date_update_mdy (d);
+ g_date_update_dmy (d);
}
- g_return_if_fail (d->mdy);
+ g_return_if_fail (d->dmy);
nmonths += d->month - 1;
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid (d));
- if (!d->mdy)
+ if (!d->dmy)
{
- g_date_update_mdy (d);
+ g_date_update_dmy (d);
}
- g_return_if_fail (d->mdy);
+ g_return_if_fail (d->dmy);
years = nmonths/12;
months = nmonths%12;
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid (d));
- if (!d->mdy)
+ if (!d->dmy)
{
- g_date_update_mdy (d);
+ g_date_update_dmy (d);
}
- g_return_if_fail (d->mdy);
+ g_return_if_fail (d->dmy);
d->year += nyears;
g_return_if_fail (d != NULL);
g_return_if_fail (g_date_valid (d));
- if (!d->mdy)
+ if (!d->dmy)
{
- g_date_update_mdy (d);
+ g_date_update_dmy (d);
}
- g_return_if_fail (d->mdy);
+ g_return_if_fail (d->dmy);
g_return_if_fail (d->year > nyears);
d->year -= nyears;
g_return_val_if_fail (g_date_valid_year (year), 0);
g_date_clear (&d, 1);
- g_date_set_mdy (&d, 1, 1, year);
+ g_date_set_dmy (&d, 1, 1, year);
if (g_date_weekday (&d) == G_DATE_MONDAY) return 53;
- g_date_set_mdy (&d, 12, 31, year);
+ g_date_set_dmy (&d, 31, 12, year);
if (g_date_weekday (&d) == G_DATE_MONDAY) return 53;
if (g_date_is_leap_year (year))
{
- g_date_set_mdy (&d, 1, 2, year);
+ g_date_set_dmy (&d, 2, 1, year);
if (g_date_weekday (&d) == G_DATE_MONDAY) return 53;
- g_date_set_mdy (&d, 12, 30, year);
+ g_date_set_dmy (&d, 30, 12, year);
if (g_date_weekday (&d) == G_DATE_MONDAY) return 53;
}
return 52;
g_return_val_if_fail (g_date_valid_year (year), 0);
g_date_clear (&d, 1);
- g_date_set_mdy (&d, 1, 1, year);
+ g_date_set_dmy (&d, 1, 1, year);
if (g_date_weekday (&d) == G_DATE_SUNDAY) return 53;
- g_date_set_mdy (&d, 12, 31, year);
+ g_date_set_dmy (&d, 31, 12, year);
if (g_date_weekday (&d) == G_DATE_SUNDAY) return 53;
if (g_date_is_leap_year (year))
{
- g_date_set_mdy (&d, 1, 2, year);
+ g_date_set_dmy (&d, 2, 1, year);
if (g_date_weekday (&d) == G_DATE_SUNDAY) return 53;
- g_date_set_mdy (&d, 12, 30, year);
+ g_date_set_dmy (&d, 30, 12, year);
if (g_date_weekday (&d) == G_DATE_SUNDAY) return 53;
}
return 52;
else if (lhs->julian_days > rhs->julian_days) return 1;
else return 0;
}
- else if (lhs->mdy && rhs->mdy)
+ else if (lhs->dmy && rhs->dmy)
{
if (lhs->year < rhs->year) return -1;
else if (lhs->year > rhs->year) return 1;
g_return_if_fail (g_date_valid (d));
g_return_if_fail (tm != NULL);
- if (!d->mdy)
+ if (!d->dmy)
{
- g_date_update_mdy (d);
+ g_date_update_dmy (d);
}
- g_return_if_fail (d->mdy);
+ g_return_if_fail (d->dmy);
/* zero all the irrelevant fields to be sure they're valid */
projects / platform / upstream / glib.git / blobdiff