luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-17 19:21:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

datetime: avoid using __year

Browse Source 
These were left over from when the inline functions where implemented
as macros.  They are no longer needed and where clashing with the
global __year anyway.

https://bugzilla.gnome.org/show_bug.cgi?id=50076
This commit is contained in:
Christian Hergert 2010-08-31 09:10:16 -07:00 committed by Emmanuele Bassi
parent 64300c0cc4
commit 52e44ddec2
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
glib/gdatetime.c
View File

@ -321,19 +321,19 @@ static inline void
g_date_time_add_usec (GDateTime *datetime, g_date_time_add_usec (GDateTime *datetime,
gint64 usecs) gint64 usecs)
{ {
gint64 __usec = datetime->usec + usecs; gint64 u = datetime->usec + usecs;
gint __days = __usec / USEC_PER_DAY; gint d = u / USEC_PER_DAY;
if (__usec < 0) if (u < 0)
__days -= 1; d -= 1;
if (__days != 0) if (d != 0)
g_date_time_add_days_internal (datetime, __days); g_date_time_add_days_internal (datetime, d);
if (__usec < 0) if (u < 0)
datetime->usec = USEC_PER_DAY + (__usec % USEC_PER_DAY); datetime->usec = USEC_PER_DAY + (u % USEC_PER_DAY);
else else
datetime->usec = __usec % USEC_PER_DAY; datetime->usec = u % USEC_PER_DAY;
} }
/*< internal > /*< internal >
@ -354,48 +354,48 @@ g_date_time_add_ymd (GDateTime *datetime,
gint months, gint months,
gint days) gint days)
{ {
gint __year = g_date_time_get_year (datetime); gint y = g_date_time_get_year (datetime);
gint __month = g_date_time_get_month (datetime); gint m = g_date_time_get_month (datetime);
gint __day = g_date_time_get_day_of_month (datetime); gint d = g_date_time_get_day_of_month (datetime);
gint step, i; gint step, i;
const guint16 *max_days; const guint16 *max_days;
__year += years; y += years;
/* subtract one day for leap years */ /* subtract one day for leap years */
if (GREGORIAN_LEAP (__year) && __month == 2) if (GREGORIAN_LEAP (y) && m == 2)
{ {
if (__day == 29) if (d == 29)
__day -= 1; d -= 1;
} }
/* add months */ /* add months */
step = months > 0 ? 1 : -1; step = months > 0 ? 1 : -1;
for (i = 0; i < ABS (months); i++) for (i = 0; i < ABS (months); i++)
{ {
__month += step; m += step;
if (__month < 1) if (m < 1)
{ {
__year -= 1; y -= 1;
__month = 12; m = 12;
} }
else if (__month > 12) else if (m > 12)
{ {
__year += 1; y += 1;
__month = 1; m = 1;
} }
} }
/* clamp the days */ /* clamp the days */
max_days = days_in_months[GREGORIAN_LEAP (__year) ? 1 : 0]; max_days = days_in_months[GREGORIAN_LEAP (y) ? 1 : 0];
if (max_days[__month] < __day) if (max_days[m] < d)
__day = max_days[__month]; d = max_days[m];
/* since the add_days_internal() uses the julian date we need to /* since the add_days_internal() uses the julian date we need to
* update it using the new year/month/day and then add the days * update it using the new year/month/day and then add the days
*/ */
datetime->julian = date_to_julian (__year, __month, __day); datetime->julian = date_to_julian (y, m, d);
g_date_time_add_days_internal (datetime, days); g_date_time_add_days_internal (datetime, days);
} }