luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-18 14:48:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_garray_warning' into 'main'

Browse Source 
Fix always true comparison warning in glib/garray.c

See merge request GNOME/glib!2311
This commit is contained in:
Philip Withnall
2021-11-04 14:18:03 +00:00
parent caf777984b 12113f398a
commit 746ce4e042
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
glib/garray.c
View File

@@ -181,7 +181,9 @@ g_array_new (gboolean zero_terminated,
guint elt_size) guint elt_size)
{ {
g_return_val_if_fail (elt_size > 0, NULL); g_return_val_if_fail (elt_size > 0, NULL);
#if (UINT_WIDTH / 8) >= GLIB_SIZEOF_SIZE_T
g_return_val_if_fail (elt_size <= G_MAXSIZE / 2 - 1, NULL); g_return_val_if_fail (elt_size <= G_MAXSIZE / 2 - 1, NULL);
#endif
return g_array_sized_new (zero_terminated, clear, elt_size, 0); return g_array_sized_new (zero_terminated, clear, elt_size, 0);
} }
@@ -262,7 +264,9 @@ g_array_sized_new (gboolean zero_terminated,
GRealArray *array; GRealArray *array;
g_return_val_if_fail (elt_size > 0, NULL); g_return_val_if_fail (elt_size > 0, NULL);
g_return_val_if_fail (elt_size <= G_MAXSIZE, NULL); #if (UINT_WIDTH / 8) >= GLIB_SIZEOF_SIZE_T
g_return_val_if_fail (elt_size <= G_MAXSIZE / 2 - 1, NULL);
#endif
array = g_slice_new (GRealArray); array = g_slice_new (GRealArray);