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

Cosmetic changes

Browse Source
This commit is contained in:
Matthias Clasen 2012-06-11 07:19:42 -04:00
parent 6ee10762b5
commit d4f8854785
2 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/gio-test.c
View File

@ -82,10 +82,7 @@ read_all (int fd,
if (error != G_IO_ERROR_NONE) if (error != G_IO_ERROR_NONE)
{ {
g_print ("gio-test: ...from %d: G_IO_ERROR_%s\n", fd, g_print ("gio-test: ...from %d: %d\n", fd, error);
(error == G_IO_ERROR_AGAIN ? "AGAIN" :
(error == G_IO_ERROR_INVAL ? "INVAL" :
(error == G_IO_ERROR_UNKNOWN ? "UNKNOWN" : "???"))));
if (error == G_IO_ERROR_AGAIN) if (error == G_IO_ERROR_AGAIN)
continue; continue;
break; break;
@ -157,12 +154,7 @@ recv_message (GIOChannel *channel,
for (i = 0; i < nkiddies; i++) for (i = 0; i < nkiddies; i++)
if (seqtab[i].fd == fd) if (seqtab[i].fd == fd)
{ {
if (seq != seqtab[i].seq) g_assert_cmpint (seq, ==, seqtab[i].seq);
{
g_print ("gio-test: ...from %d: invalid sequence number %d, expected %d\n",
fd, seq, seqtab[i].seq);
g_assert_not_reached ();
}
seqtab[i].seq++; seqtab[i].seq++;
break; break;
} }
@ -184,11 +176,7 @@ recv_message (GIOChannel *channel,
g_assert (nb == sizeof (nbytes)); g_assert (nb == sizeof (nbytes));
if (nbytes >= BUFSIZE) g_assert_cmpint (nbytes, <, BUFSIZE);
{
g_print ("gio-test: ...from %d: nbytes = %d (%#x)!\n", fd, nbytes, nbytes);
g_assert_not_reached ();
}
g_assert (nbytes >= 0 && nbytes < BUFSIZE); g_assert (nbytes >= 0 && nbytes < BUFSIZE);
#ifdef VERBOSE #ifdef VERBOSE
g_print ("gio-test: ...from %d: %d bytes\n", fd, nbytes); g_print ("gio-test: ...from %d: %d bytes\n", fd, nbytes);
@ -210,12 +198,7 @@ recv_message (GIOChannel *channel,
} }
for (j = 0; j < nbytes; j++) for (j = 0; j < nbytes; j++)
if (buf[j] != ' ' + ((nbytes + j) % 95)) g_assert (buf[j] == ' ' + ((nbytes + j) % 95));
{
g_print ("gio-test: ...from %d: buf[%d] == '%c', should be '%c'\n",
fd, j, buf[j], 'a' + ((nbytes + j) % 32));
g_assert_not_reached ();
}
#ifdef VERBOSE #ifdef VERBOSE
g_print ("gio-test: ...from %d: OK\n", fd); g_print ("gio-test: ...from %d: OK\n", fd);
#endif #endif

18
tests/iochannel-test.c
View File

@ -26,7 +26,7 @@ test_small_writes (void)
g_warning ("Unable to open file %s: %s", g_warning ("Unable to open file %s: %s",
"iochannel-test-outfile", "iochannel-test-outfile",
error->message); error->message);
g_error_free (error); g_clear_error (&error);
exit (1); exit (1);
} }
@ -75,14 +75,14 @@ gint main (gint argc, gchar * argv[])
if (gerr) if (gerr)
{ {
g_warning ("Unable to open file %s: %s", filename, gerr->message); g_warning ("Unable to open file %s: %s", filename, gerr->message);
g_error_free (gerr); g_clear_error (&gerr);
return 1; return 1;
} }
gio_w = g_io_channel_new_file ("iochannel-test-outfile", "w", &gerr); gio_w = g_io_channel_new_file ("iochannel-test-outfile", "w", &gerr);
if (gerr) if (gerr)
{ {
g_warning ("Unable to open file %s: %s", "iochannel-test-outfile", gerr->message); g_warning ("Unable to open file %s: %s", "iochannel-test-outfile", gerr->message);
g_error_free (gerr); g_clear_error (&gerr);
return 1; return 1;
} }
@ -93,8 +93,7 @@ gint main (gint argc, gchar * argv[])
/* Keep going if this is just a case of iconv not supporting EUC-JP, see bug 428048 */ /* Keep going if this is just a case of iconv not supporting EUC-JP, see bug 428048 */
if (gerr->code != G_CONVERT_ERROR_NO_CONVERSION) if (gerr->code != G_CONVERT_ERROR_NO_CONVERSION)
return 1; return 1;
g_error_free (gerr); g_clear_error (&gerr);
gerr = NULL;
} }
g_io_channel_set_buffer_size (gio_r, BUFFER_SIZE); g_io_channel_set_buffer_size (gio_r, BUFFER_SIZE);
@ -103,8 +102,7 @@ gint main (gint argc, gchar * argv[])
if (status == G_IO_STATUS_ERROR) if (status == G_IO_STATUS_ERROR)
{ {
g_warning ("%s", gerr->message); g_warning ("%s", gerr->message);
g_error_free (gerr); g_clear_error (&gerr);
gerr = NULL;
} }
buffer = g_string_sized_new (BUFFER_SIZE); buffer = g_string_sized_new (BUFFER_SIZE);
@ -142,8 +140,7 @@ gint main (gint argc, gchar * argv[])
break; break;
case G_IO_STATUS_ERROR: case G_IO_STATUS_ERROR:
g_warning ("%s", gerr->message); g_warning ("%s", gerr->message);
g_error_free (gerr); g_clear_error (&gerr);
gerr = NULL;
break; break;
default: default:
g_warning ("Abnormal exit from write loop."); g_warning ("Abnormal exit from write loop.");
@ -157,8 +154,7 @@ gint main (gint argc, gchar * argv[])
if (status == G_IO_STATUS_ERROR) if (status == G_IO_STATUS_ERROR)
{ {
g_warning ("%s", gerr->message); g_warning ("%s", gerr->message);
g_error_free (gerr); g_clear_error (&gerr);
gerr = NULL;
} }
#ifdef VERBOSE #ifdef VERBOSE