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

Merge branch 'cleanup-warnings-split-2' into 'main'

Browse Source 
Cleanup warnings split 2

See merge request GNOME/glib!2491
This commit is contained in:
Philip Withnall
2022-02-18 13:39:25 +00:00
parent 2801f7383a eb961b02d6
commit 5ac86e21b3
9 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/gio-test.c
View File

@@ -128,7 +128,7 @@ recv_message (GIOChannel *channel,
if (cond & G_IO_IN)
{
char buf[BUFSIZE];
guint nbytes;
guint nbytes = 0;
guint nb;
guint j;
int i, seq;
@@ -297,7 +297,7 @@ main (int argc,
exit (1);
}
windows_messages_channel = g_io_channel_win32_new_messages ((guint)hwnd);
windows_messages_channel = g_io_channel_win32_new_messages ((guint) (guintptr) hwnd);
g_io_add_watch (windows_messages_channel, G_IO_IN, recv_windows_message, 0);
#endif

32
tests/mapping-test.c
View File

@@ -29,7 +29,7 @@
#include <process.h>
#endif
static gchar *dir, *filename, *displayname, *childname;
static gchar *dir, *global_filename, *global_displayname, *childname;
static gboolean stop = FALSE;
@@ -113,7 +113,7 @@ child_main (int argc, char *argv[])
GMainLoop *loop;
parent_pid = atoi (argv[2]);
map = map_or_die (filename, FALSE);
map = map_or_die (global_filename, FALSE);
#ifndef G_OS_WIN32
signal (SIGUSR1, handle_usr1);
@@ -139,13 +139,13 @@ test_mapping (void)
{
GMappedFile *map;
write_or_die (filename, "ABC", -1);
write_or_die (global_filename, "ABC", -1);
map = map_or_die (filename, FALSE);
map = map_or_die (global_filename, FALSE);
g_assert (g_mapped_file_get_length (map) == 3);
g_mapped_file_free (map);
map = map_or_die (filename, TRUE);
map = map_or_die (global_filename, TRUE);
g_assert (g_mapped_file_get_length (map) == 3);
g_mapped_file_free (map);
g_message ("test_mapping: ok");
@@ -159,8 +159,8 @@ test_private (void)
gchar *buffer;
gsize len;
write_or_die (filename, "ABC", -1);
map = map_or_die (filename, TRUE);
write_or_die (global_filename, "ABC", -1);
map = map_or_die (global_filename, TRUE);
buffer = (gchar *)g_mapped_file_get_contents (map);
buffer[0] = '1';
@@ -168,10 +168,10 @@ test_private (void)
buffer[2] = '3';
g_mapped_file_free (map);
if (!g_file_get_contents (filename, &buffer, &len, &error))
if (!g_file_get_contents (global_filename, &buffer, &len, &error))
{
g_print ("failed to read '%s': %s\n",
displayname, error->message);
g_print ("failed to read '%s': %s\n",
global_displayname, error->message);
exit (1);
}
@@ -201,8 +201,8 @@ test_child_private (gchar *argv0)
g_assert (!g_file_test ("STOP", G_FILE_TEST_EXISTS));
#endif
write_or_die (filename, "ABC", -1);
map = map_or_die (filename, TRUE);
write_or_die (global_filename, "ABC", -1);
map = map_or_die (global_filename, TRUE);
#ifndef G_OS_WIN32
signal (SIGUSR1, handle_usr1);
@@ -303,8 +303,8 @@ main (int argc,
#endif
dir = g_get_current_dir ();
filename = g_build_filename (dir, "maptest", NULL);
displayname = g_filename_display_name (filename);
global_filename = g_build_filename (dir, "maptest", NULL);
global_displayname = g_filename_display_name (global_filename);
childname = g_build_filename (dir, "mapchild", NULL);
if (argc > 1)
@@ -313,8 +313,8 @@ main (int argc,
ret = parent_main (argc, argv);
g_free (childname);
g_free (filename);
g_free (displayname);
g_free (global_filename);
g_free (global_displayname);
g_free (dir);
return ret;