diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/break-loader.c | 10 | ||||
-rw-r--r-- | test/echo-client.c | 10 | ||||
-rw-r--r-- | test/echo-server.c | 8 |
3 files changed, 16 insertions, 12 deletions
diff --git a/test/break-loader.c b/test/break-loader.c index f08f43d9..8aa15a80 100644 --- a/test/break-loader.c +++ b/test/break-loader.c @@ -154,7 +154,7 @@ try_mutated_data (const DBusString *data) if (failed) { const char *filename_c; - DBusResultCode result; + DBusError error; _dbus_string_append (&filename, ".message-raw"); @@ -162,12 +162,12 @@ try_mutated_data (const DBusString *data) printf ("Child failed, writing %s\n", filename_c); - result = _dbus_string_save_to_file (data, &filename); - - if (result != DBUS_RESULT_SUCCESS) + dbus_error_init (&error); + if (!_dbus_string_save_to_file (data, &filename, &error)) { fprintf (stderr, "Failed to save failed message data: %s\n", - dbus_result_to_string (result)); + error.message); + dbus_error_free (&error); exit (1); /* so we can see the seed that was printed out */ } diff --git a/test/echo-client.c b/test/echo-client.c index de32957f..b6f68fd7 100644 --- a/test/echo-client.c +++ b/test/echo-client.c @@ -7,7 +7,7 @@ main (int argc, char **argv) { DBusConnection *connection; - DBusResultCode result; + DBusError error; DBusMessage *message; if (argc < 2) @@ -15,12 +15,14 @@ main (int argc, fprintf (stderr, "Give the server address as an argument\n"); return 1; } - - connection = dbus_connection_open (argv[1], &result); + + dbus_error_init (&error); + connection = dbus_connection_open (argv[1], &error); if (connection == NULL) { fprintf (stderr, "Failed to open connection to %s: %s\n", - argv[1], dbus_result_to_string (result)); + argv[1], error.message); + dbus_error_free (&error); return 1; } diff --git a/test/echo-server.c b/test/echo-server.c index 27e10e72..9cfcd307 100644 --- a/test/echo-server.c +++ b/test/echo-server.c @@ -20,7 +20,7 @@ main (int argc, char **argv) { DBusServer *server; - DBusResultCode result; + DBusError error; if (argc < 2) { @@ -28,11 +28,13 @@ main (int argc, return 1; } - server = dbus_server_listen (argv[1], &result); + dbus_error_init (&error); + server = dbus_server_listen (argv[1], &error); if (server == NULL) { fprintf (stderr, "Failed to start server on %s: %s\n", - argv[1], dbus_result_to_string (result)); + argv[1], error.message); + dbus_error_free (&error); return 1; } |