Merge branch 'fix_warnings' into 'master'

Fix warnings (keep going)

See merge request GNOME/glib!1647
This commit is contained in:
Philip Withnall 2020-10-14 14:10:05 +00:00
commit 31bca17f52
5 changed files with 15 additions and 16 deletions

View File

@ -366,7 +366,7 @@ array_remove_index (gconstpointer test_data)
{
const ArrayTestData *config = test_data;
GArray *garray;
gint i;
guint i;
gint prev, cur;
garray = g_array_new (config->zero_terminated, config->clear_, sizeof (gint));
@ -403,7 +403,7 @@ array_remove_index_fast (gconstpointer test_data)
{
const ArrayTestData *config = test_data;
GArray *garray;
gint i;
guint i;
gint prev, cur;
garray = g_array_new (config->zero_terminated, config->clear_, sizeof (gint));
@ -443,7 +443,7 @@ array_remove_range (gconstpointer test_data)
{
const ArrayTestData *config = test_data;
GArray *garray;
gint i;
guint i;
gint prev, cur;
garray = g_array_new (config->zero_terminated, config->clear_, sizeof (gint));
@ -586,7 +586,7 @@ array_sort (gconstpointer test_data)
{
const ArrayTestData *config = test_data;
GArray *garray;
gint i;
guint i;
gint prev, cur;
garray = g_array_new (config->zero_terminated, config->clear_, sizeof (gint));
@ -618,7 +618,7 @@ array_sort_with_data (gconstpointer test_data)
{
const ArrayTestData *config = test_data;
GArray *garray;
gint i;
guint i;
gint prev, cur;
garray = g_array_new (config->zero_terminated, config->clear_, sizeof (gint));
@ -1859,7 +1859,7 @@ static void
byte_array_sort (void)
{
GByteArray *gbarray;
gint i;
guint i;
guint8 val;
guint8 prev, cur;
@ -1887,7 +1887,7 @@ static void
byte_array_sort_with_data (void)
{
GByteArray *gbarray;
gint i;
guint i;
guint8 val;
guint8 prev, cur;

View File

@ -9,7 +9,7 @@ static guchar data[DATA_SIZE];
static void
test_incremental (gboolean line_break,
gint length)
gsize length)
{
char *p;
gsize len, decoded_len, max, input_len, block_size;

View File

@ -1014,9 +1014,8 @@ hexval (const gchar c)
static guint8 *
sum_to_digest (const gchar *sum, gsize *len)
{
gsize l;
gsize i, l;
guint8 *digest;
gint i;
g_assert (strlen (sum) % 2 == 0);
l = strlen (sum) / 2;
@ -1074,7 +1073,7 @@ static void
test_checksum_string (gconstpointer d)
{
const ChecksumComputeTest *test = d;
int length;
gsize length;
gchar *checksum;
for (length = 0; length <= FIXED_LEN; length++)
@ -1098,7 +1097,7 @@ test_checksum_bytes (gconstpointer d)
{
const ChecksumComputeTest *test = d;
GBytes *input;
int length;
gsize length;
gchar *checksum;
for (length = 0; length <= FIXED_LEN; length++)
@ -1179,7 +1178,7 @@ test_unsupported (void)
int
main (int argc, char *argv[])
{
int length;
gsize length;
g_test_init (&argc, &argv, NULL);

View File

@ -138,7 +138,7 @@ test_byte_order (void)
static void
check_utf8_to_ucs4 (const char *utf8,
glong utf8_len,
gsize utf8_len,
const gunichar *ucs4,
glong ucs4_len,
glong error_pos)
@ -292,7 +292,7 @@ check_ucs4_to_utf8 (const gunichar *ucs4,
static void
check_utf8_to_utf16 (const char *utf8,
glong utf8_len,
gsize utf8_len,
const gunichar2 *utf16,
glong utf16_len,
glong error_pos)

View File

@ -976,7 +976,7 @@ test_set_contents_full (void)
gboolean use_strlen;
gboolean expected_success;
GFileError expected_error;
gint expected_error;
}
tests[] =
{