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

Fix several signedness warnings in glib/tests/uri.c

Browse Source 
In file included from glib/glib.h:86,
                 from glib/tests/uri.c:25:
glib/gtestutils.h:134:96: error: comparison of integer expressions of different signedness: ‘gint’ {aka ‘int’} and ‘GConvertError’
  134 |                                                if (!err || (err)->domain != dom || (err)->code != c) \
      |                                                                                                ^~
glib/tests/uri.c:182:9: note: in expansion of macro ‘g_assert_error’
  182 |         g_assert_error (error, G_CONVERT_ERROR, file_to_uri_tests[i].expected_error);
      |         ^~~~~~~~~~~~~~
glib/gtestutils.h:134:96: error: comparison of integer expressions of different signedness: ‘gint’ {aka ‘int’} and ‘GConvertError’
  134 |                                                if (!err || (err)->domain != dom || (err)->code != c) \
      |                                                                                                ^~
glib/tests/uri.c:220:9: note: in expansion of macro ‘g_assert_error’
  220 |         g_assert_error (error, G_CONVERT_ERROR, file_from_uri_tests[i].expected_error);
      |         ^~~~~~~~~~~~~~
glib/tests/uri.c: In function ‘test_uri_parsing_absolute’:
glib/gtestutils.h:134:96: error: comparison of integer expressions of different signedness: ‘gint’ {aka ‘int’} and ‘GUriError’
  134 |                                                if (!err || (err)->domain != dom || (err)->code != c) \
      |                                                                                                ^~
glib/tests/uri.c:790:11: note: in expansion of macro ‘g_assert_error’
  790 |           g_assert_error (error, G_URI_ERROR, test->expected_error_code);
      |           ^~~~~~~~~~~~~~
In file included from glib/glibconfig.h:9,
                 from glib/gtypes.h:32,
                 from glib/galloca.h:32,
                 from glib/glib.h:30,
                 from glib/tests/uri.c:25:
glib/tests/uri.c: In function ‘test_uri_iter_params’:
glib/tests/uri.c:1495:51: error: comparison of integer expressions of different signedness: ‘gssize’ {aka ‘const long int’} and ‘long unsigned int’
 1495 |                 params_tests[i].expected_n_params <= G_N_ELEMENTS (params_tests[i].expected_param_key_values) / 2);
      |                                                   ^~
glib/gmacros.h:941:25: note: in definition of macro ‘G_LIKELY’
  941 | #define G_LIKELY(expr) (expr)
      |                         ^~~~
glib/tests/uri.c:1494:7: note: in expansion of macro ‘g_assert’
 1494 |       g_assert (params_tests[i].expected_n_params < 0 ||
      |       ^~~~~~~~
glib/tests/uri.c: In function ‘test_uri_parse_params’:
glib/tests/uri.c:1562:51: error: comparison of integer expressions of different signedness: ‘gssize’ {aka ‘const long int’} and ‘long unsigned int’
 1562 |                 params_tests[i].expected_n_params <= G_N_ELEMENTS (params_tests[i].expected_param_key_values) / 2);
      |                                                   ^~
glib/gmacros.h:941:25: note: in definition of macro ‘G_LIKELY’
  941 | #define G_LIKELY(expr) (expr)
      |                         ^~~~
glib/tests/uri.c:1561:7: note: in expansion of macro ‘g_assert’
 1561 |       g_assert (params_tests[i].expected_n_params < 0 ||
      |       ^~~~~~~~
This commit is contained in:
Emmanuel Fleury 2020-11-14 14:43:39 +01:00
parent e457df8b8b
commit 40e70f5d94
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glib/tests/uri.c
View File

@ -32,7 +32,7 @@ typedef struct
char *filename; char *filename;
char *hostname; char *hostname;
char *expected_result; char *expected_result;
GConvertError expected_error; /* If failed */ gint expected_error; /* If failed */
} FileToUriTest; } FileToUriTest;
FileToUriTest FileToUriTest
@ -100,7 +100,7 @@ typedef struct
char *uri; char *uri;
char *expected_filename; char *expected_filename;
char *expected_hostname; char *expected_hostname;
GConvertError expected_error; /* If failed */ gint expected_error; /* If failed */
} FileFromUriTest; } FileFromUriTest;
FileFromUriTest FileFromUriTest
@ -549,7 +549,7 @@ typedef struct {
GUriFlags flags; GUriFlags flags;
/* Outputs */ /* Outputs */
gboolean expected_success; gboolean expected_success;
GUriError expected_error_code; /* unused if @expected_success is true */ gint expected_error_code; /* unused if @expected_success is true */
const UriParts expected_parts; /* unused if @expected_success is false */ const UriParts expected_parts; /* unused if @expected_success is false */
} UriAbsoluteTest; } UriAbsoluteTest;
@ -1492,7 +1492,7 @@ test_uri_iter_params (gconstpointer test_data)
g_test_message ("URI %" G_GSIZE_FORMAT ": %s", i, params_tests[i].uri); g_test_message ("URI %" G_GSIZE_FORMAT ": %s", i, params_tests[i].uri);
g_assert (params_tests[i].expected_n_params < 0 || g_assert (params_tests[i].expected_n_params < 0 ||
params_tests[i].expected_n_params <= G_N_ELEMENTS (params_tests[i].expected_param_key_values) / 2); params_tests[i].expected_n_params <= (gssize) G_N_ELEMENTS (params_tests[i].expected_param_key_values) / 2);
/* The tests get run twice: once with the length unspecified, using a /* The tests get run twice: once with the length unspecified, using a
* nul-terminated string; and once with the length specified and a copy of * nul-terminated string; and once with the length specified and a copy of
@ -1559,7 +1559,7 @@ test_uri_parse_params (gconstpointer test_data)
g_test_message ("URI %" G_GSIZE_FORMAT ": %s", i, params_tests[i].uri); g_test_message ("URI %" G_GSIZE_FORMAT ": %s", i, params_tests[i].uri);
g_assert (params_tests[i].expected_n_params < 0 || g_assert (params_tests[i].expected_n_params < 0 ||
params_tests[i].expected_n_params <= G_N_ELEMENTS (params_tests[i].expected_param_key_values) / 2); params_tests[i].expected_n_params <= (gssize) G_N_ELEMENTS (params_tests[i].expected_param_key_values) / 2);
/* The tests get run twice: once with the length unspecified, using a /* The tests get run twice: once with the length unspecified, using a
* nul-terminated string; and once with the length specified and a copy of * nul-terminated string; and once with the length specified and a copy of