luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-27 07:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdate: Make integer comparisons explicit

Browse Source 
GDate.dmy is a 1-bit bitfield which is treated as a boolean. However,
it’s still an integer, and we can’t really treat it like a gboolean
because it’s a bitfield. Make the comparisons with it explicitly compare
integers, rather than implicitly, to make it more obvious that it is
actually an integer.

This introduces no functional changes.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

https://bugzilla.gnome.org/show_bug.cgi?id=335731
This commit is contained in:
Philip Withnall 2018-04-13 15:28:06 +01:00
parent 38080bad05
commit f9ff79704c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glib/gdate.c
View File

@ -514,7 +514,7 @@ g_date_update_julian (const GDate *const_d)
gint idx;
g_return_if_fail (d != NULL);
g_return_if_fail (d->dmy);
g_return_if_fail (d->dmy != 0);
g_return_if_fail (!d->julian);
g_return_if_fail (g_date_valid_dmy (d->day, d->month, d->year));
@ -1721,7 +1721,7 @@ g_date_add_months (GDate *d,
if (!d->dmy)
g_date_update_dmy (d);
g_return_if_fail (d->dmy);
g_return_if_fail (d->dmy != 0);
g_return_if_fail (nmonths <= G_MAXUINT - (d->month - 1));
nmonths += d->month - 1;
@ -1766,7 +1766,7 @@ g_date_subtract_months (GDate *d,
if (!d->dmy)
g_date_update_dmy (d);
g_return_if_fail (d->dmy);
g_return_if_fail (d->dmy != 0);
years = nmonths/12;
months = nmonths%12;
@ -1812,7 +1812,7 @@ g_date_add_years (GDate *d,
if (!d->dmy)
g_date_update_dmy (d);
g_return_if_fail (d->dmy);
g_return_if_fail (d->dmy != 0);
g_return_if_fail (nyears <= G_MAXUINT16 - d->year);
d->year += nyears;
@ -1846,7 +1846,7 @@ g_date_subtract_years (GDate *d,
if (!d->dmy)
g_date_update_dmy (d);
g_return_if_fail (d->dmy);
g_return_if_fail (d->dmy != 0);
g_return_if_fail (d->year > nyears);
d->year -= nyears;
@ -2058,7 +2058,7 @@ g_date_to_struct_tm (const GDate *d,
if (!d->dmy)
g_date_update_dmy (d);
g_return_if_fail (d->dmy);
g_return_if_fail (d->dmy != 0);
/* zero all the irrelevant fields to be sure they're valid */