test_small_writes (void)
{
GIOChannel *io;
- GIOStatus status;
+ GIOStatus status = G_IO_STATUS_ERROR;
guint cnt;
gchar tmp;
GError *error = NULL;
g_warning ("Unable to open file %s: %s",
"iochannel-test-outfile",
error->message);
- g_error_free (error);
+ g_clear_error (&error);
exit (1);
}
GError *gerr = NULL;
GString *buffer;
char *filename;
- char *srcdir = getenv ("srcdir");
gint rlength = 0;
glong wlength = 0;
gsize length_out;
const gchar encoding[] = "EUC-JP";
GIOStatus status;
- if (!srcdir)
- srcdir = ".";
- filename = g_strconcat (srcdir, G_DIR_SEPARATOR_S, "iochannel-test-infile", NULL);
-
+ g_test_init (&argc, &argv, NULL);
+
+ filename = g_test_build_filename (G_TEST_DIST, "iochannel-test-infile", NULL);
+
setbuf (stdout, NULL); /* For debugging */
gio_r = g_io_channel_new_file (filename, "r", &gerr);
if (gerr)
{
g_warning ("Unable to open file %s: %s", filename, gerr->message);
- g_error_free (gerr);
+ g_clear_error (&gerr);
return 1;
}
gio_w = g_io_channel_new_file ("iochannel-test-outfile", "w", &gerr);
if (gerr)
{
g_warning ("Unable to open file %s: %s", "iochannel-test-outfile", gerr->message);
- g_error_free (gerr);
+ g_clear_error (&gerr);
return 1;
}
/* 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)
return 1;
- g_error_free (gerr);
- gerr = NULL;
+ g_clear_error (&gerr);
}
g_io_channel_set_buffer_size (gio_r, BUFFER_SIZE);
if (status == G_IO_STATUS_ERROR)
{
g_warning ("%s", gerr->message);
- g_error_free (gerr);
- gerr = NULL;
+ g_clear_error (&gerr);
}
buffer = g_string_sized_new (BUFFER_SIZE);
break;
case G_IO_STATUS_ERROR:
g_warning ("%s", gerr->message);
- g_error_free (gerr);
- gerr = NULL;
+ g_clear_error (&gerr);
break;
default:
g_warning ("Abnormal exit from write loop.");
if (status == G_IO_STATUS_ERROR)
{
g_warning ("%s", gerr->message);
- g_error_free (gerr);
- gerr = NULL;
+ g_clear_error (&gerr);
}
#ifdef VERBOSE
g_io_channel_unref(gio_w);
test_small_writes ();
-
+
+ g_free (filename);
+ g_string_free (buffer, TRUE);
+
return 0;
}