luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 18:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-2631-ptrdiff-glib-2-72' into 'glib-2-72'

Browse Source 
Backport !2631 “Cast to guintptr instead of subtracting by null” to glib-2-72

See merge request GNOME/glib!2644
This commit is contained in:
Sebastian Dröge 2022-05-10 09:00:31 +00:00
commit 3370232419
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
glib/gqsort.c
View File

@ -263,16 +263,15 @@ msort_r (void *b, size_t n, size_t s, GCompareDataFunc cmp, void *arg)
else else
{ {
if ((s & (sizeof (guint32) - 1)) == 0 if ((s & (sizeof (guint32) - 1)) == 0
&& ((char *) b - (char *) 0) % ALIGNOF_GUINT32 == 0) && (guintptr) b % ALIGNOF_GUINT32 == 0)
{ {
if (s == sizeof (guint32)) if (s == sizeof (guint32))
p.var = 0; p.var = 0;
else if (s == sizeof (guint64) else if (s == sizeof (guint64)
&& ((char *) b - (char *) 0) % ALIGNOF_GUINT64 == 0) && (guintptr) b % ALIGNOF_GUINT64 == 0)
p.var = 1; p.var = 1;
else if ((s & (sizeof (unsigned long) - 1)) == 0 else if ((s & (sizeof (unsigned long) - 1)) == 0
&& ((char *) b - (char *) 0) && (guintptr) b % ALIGNOF_UNSIGNED_LONG == 0)
% ALIGNOF_UNSIGNED_LONG == 0)
p.var = 2; p.var = 2;
} }
msort_with_tmp (&p, b, n); msort_with_tmp (&p, b, n);