Menu
▾
▴
[Opensync-commits] r1172 - trunk/tests
|
From: <svn...@op...> - 2009-07-13 11:50:59
|
Author: bellmich Date: Mon Jul 13 13:50:53 2009 New Revision: 1172 URL: http://libsyncml.opensync.org/changeset/1172 Log: migrated check_http from SmlError to GError Modified: trunk/tests/check_http.c Modified: trunk/tests/check_http.c ============================================================================== --- trunk/tests/check_http.c Mon Jul 13 13:44:15 2009 (r1171) +++ trunk/tests/check_http.c Mon Jul 13 13:50:53 2009 (r1172) @@ -22,6 +22,7 @@ #include "tests/support.h" #include <libsyncml/sml_transport_internals.h> +#include <libsyncml/sml_error_internals.h> int client_connects; int client_disconnects; @@ -54,7 +55,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *tsp = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); sml_fail_unless(tsp != NULL, NULL); sml_fail_unless(error == NULL, NULL); @@ -67,15 +68,15 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *tsp = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); sml_fail_unless(tsp != NULL, NULL); sml_fail_unless(error == NULL, NULL); - sml_fail_unless(smlTransportSetConfigOption(tsp, "URL", "http://libsyncml.opensyncml.org", &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportSetConfigOption(tsp, "URL", "http://libsyncml.opensyncml.org", &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); sml_fail_unless(smlTransportFinalize(tsp, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -89,7 +90,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *tsp = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); sml_fail_unless(tsp != NULL, NULL); sml_fail_unless(error == NULL, NULL); @@ -101,7 +102,7 @@ sml_fail_unless(!smlTransportInitialize(tsp, &config, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlTransportFree(tsp); } @@ -114,7 +115,7 @@ reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *tsp = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); sml_fail_unless(tsp != NULL, NULL); sml_fail_unless(error == NULL, NULL); @@ -124,11 +125,11 @@ sml_fail_unless(error == NULL, NULL); /* The transport is not configured but libsoup can initialize a default client */ - sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportFinalize(tsp, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportFinalize(tsp, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); smlTransportFree(tsp); } @@ -138,7 +139,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *tsp = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); sml_fail_unless(tsp != NULL, NULL); sml_fail_unless(error == NULL, NULL); @@ -147,7 +148,7 @@ } END_TEST -SmlBool _recv_client_event(SmlTransport *tsp, SmlLink *link_, SmlTransportEventType type, SmlTransportData *data, SmlError *error, void *userdata) +gboolean _recv_client_event(SmlTransport *tsp, SmlLink *link_, SmlTransportEventType type, SmlTransportData *data, const GError *error, void *userdata) { smlTrace(TRACE_ENTRY, "%s(%p, %p, %d)", __func__, tsp, link_, type); @@ -179,10 +180,10 @@ return TRUE; } -SmlBool _recv_server_event(SmlTransport *tsp, SmlLink *link_, SmlTransportEventType type, SmlTransportData *data, SmlError *error, void *userdata) +gboolean _recv_server_event(SmlTransport *tsp, SmlLink *link_, SmlTransportEventType type, SmlTransportData *data, const GError *error, void *userdata) { smlTrace(TRACE_ENTRY, "%s(%p, %d, %p)", __func__, link_, type, error); - SmlError *locerror = NULL; + GError *locerror = NULL; SmlLink *last = NULL; switch (type) { @@ -210,18 +211,18 @@ if (GPOINTER_TO_INT(userdata) == 1) { data = smlTransportDataNew((char *)"answer", 7, SML_MIMETYPE_WBXML, FALSE, &locerror); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(locerror == NULL, "%s", smlErrorPrint(&locerror)); + sml_fail_unless(locerror == NULL, "%s", locerror->message); - sml_fail_unless(smlTransportSend(tsp, link_, data, &locerror), "%s", smlErrorPrint(&locerror)); + sml_fail_unless(smlTransportSend(tsp, link_, data, &locerror), "%s", locerror->message); smlTransportDataDeref(data); } else if (GPOINTER_TO_INT(userdata) == 2) { - SmlError *newerror = NULL; - smlErrorSet(&newerror, SML_ERROR_GENERIC, "test"); - smlTransportSetError(tsp, link_, &newerror); - smlErrorDeref(&newerror); + GError *newerror = NULL; + SML_SET_ERROR(&newerror, SML_ERROR_GENERIC, "test"); + smlTransportSendError(tsp, link_, newerror); + SML_ERROR_FREE(newerror); } else if (GPOINTER_TO_INT(userdata) == 3) { - sml_fail_unless(smlTransportDisconnect(tsp, link_, &locerror), "%s", smlErrorPrint(&locerror)); + sml_fail_unless(smlTransportDisconnect(tsp, link_, &locerror), "%s", locerror->message); } else { sml_fail_unless(FALSE, "Some unexpected userdata %i was detected.", GPOINTER_TO_INT(userdata)); } @@ -230,10 +231,10 @@ sml_fail_unless(data->type == SML_MIMETYPE_XML, NULL); sml_fail_unless(link_ != NULL, NULL); - SmlError *newerror = NULL; - smlErrorSet(&newerror, SML_ERROR_GENERIC, "test2"); - smlTransportSetError(tsp, link_, &newerror); - smlErrorDeref(&newerror); + GError *newerror = NULL; + SML_SET_ERROR(&newerror, SML_ERROR_GENERIC, "test2"); + smlTransportSendError(tsp, link_, newerror); + SML_ERROR_FREE(newerror); } else { sml_fail_unless(FALSE, "The received data was not expected (%s).", data->data); } @@ -251,7 +252,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *tsp = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); sml_fail_unless(tsp != NULL, NULL); sml_fail_unless(error == NULL, NULL); @@ -261,8 +262,8 @@ smlTransportSetEventCallback(tsp, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); sml_fail_unless(smlTransportFinalize(tsp, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -275,7 +276,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *tsp = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); sml_fail_unless(tsp != NULL, NULL); sml_fail_unless(error == NULL, NULL); @@ -283,11 +284,11 @@ /* -1 is an illegal port. */ sml_fail_unless(smlTransportSetConfigOption(tsp, "PORT", "-1", &error) == FALSE, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); /* The default config of libsoup can be used to setup a valid transport. */ - sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); sml_fail_unless(smlTransportFinalize(tsp, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -300,7 +301,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); SmlTransport *client = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); @@ -311,8 +312,8 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); sml_fail_unless(smlTransportConnect(client, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -324,7 +325,7 @@ /* disconnect the client */ - sml_fail_unless(smlTransportDisconnect(client, NULL, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportDisconnect(client, NULL, &error), "%s", error->message); sml_fail_unless(error == NULL, NULL); while (client_disconnects == 0) { usleep(50); }; @@ -346,7 +347,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); SmlTransport *client = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); @@ -357,8 +358,8 @@ smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); @@ -372,7 +373,7 @@ /* disconnect client */ - sml_fail_unless(smlTransportDisconnect(client, NULL, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportDisconnect(client, NULL, &error), "%s", error->message); while(client_disconnects < 1) { usleep(50); } /* disconnect server */ @@ -394,7 +395,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); SmlTransport *client = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); @@ -406,8 +407,8 @@ smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(3)); smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); @@ -445,7 +446,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); SmlTransport *client = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); @@ -456,8 +457,8 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); @@ -477,7 +478,7 @@ /* disconnect client */ - sml_fail_unless(smlTransportDisconnect(client, NULL, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportDisconnect(client, NULL, &error), "%s", error->message); while(client_disconnects < 1) { usleep(50); } /* disconnect server */ @@ -499,7 +500,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); SmlTransport *client = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); @@ -510,8 +511,8 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); SmlTransportData *data = NULL; @@ -538,7 +539,7 @@ /* disconnect client */ - sml_fail_unless(smlTransportDisconnect(client, NULL, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportDisconnect(client, NULL, &error), "%s", error->message); while(client_disconnects < 1) { usleep(50); } /* disconnect server */ @@ -571,14 +572,14 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *client = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); sml_fail_unless(smlTransportSetConfigOption(client, "URL", "http://127.0.0.1:10013", &error), NULL); smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); @@ -606,7 +607,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); SmlTransport *client = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); @@ -617,8 +618,8 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(2)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); @@ -646,7 +647,7 @@ sml_fail_unless(server_disconnects == 1, NULL); sml_fail_unless(smlTransportFinalize(client, &error), NULL); - sml_fail_unless(smlTransportFinalize(server, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message); smlTransportFree(client); smlTransportFree(server); @@ -657,7 +658,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); SmlTransport *client1 = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); SmlTransport *client2 = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); @@ -674,10 +675,10 @@ smlTransportSetEventCallback(client3, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client1, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(client2, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(client3, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client1, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client2, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client3, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); @@ -715,9 +716,9 @@ sml_fail_unless(client_receives == 3, NULL); sml_fail_unless(server_receives == 3, NULL); - sml_fail_unless(smlTransportDisconnect(client1, NULL, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportDisconnect(client2, NULL, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportDisconnect(client3, NULL, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportDisconnect(client1, NULL, &error), "%s", error->message); + sml_fail_unless(smlTransportDisconnect(client2, NULL, &error), "%s", error->message); + sml_fail_unless(smlTransportDisconnect(client3, NULL, &error), "%s", error->message); while (client_disconnects < 3) { usleep(100); }; @@ -730,7 +731,7 @@ * that the list will be cleaned up before * this for-loop ends */ - sml_fail_unless(smlTransportDisconnect(server, g_list_nth_data(links, i-1), &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportDisconnect(server, g_list_nth_data(links, i-1), &error), "%s", error->message); while (server_disconnects < 3 - i + 1) { usleep(100); } @@ -757,7 +758,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); SmlTransport *client1 = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); SmlTransport *client2 = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); @@ -774,10 +775,10 @@ smlTransportSetEventCallback(client3, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client1, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(client2, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(client3, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client1, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client2, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client3, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); @@ -817,7 +818,7 @@ sml_fail_unless(client_errors == 2, NULL); sml_fail_unless(server_receives == 3, NULL); - sml_fail_unless(smlTransportDisconnect(client1, NULL, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportDisconnect(client1, NULL, &error), "%s", error->message); while (client_disconnects < 1) { usleep(100); } @@ -830,7 +831,7 @@ * that the list will be cleaned up before * this for-loop ends */ - sml_fail_unless(smlTransportDisconnect(server, g_list_nth_data(links, i-1), &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportDisconnect(server, g_list_nth_data(links, i-1), &error), "%s", error->message); while (server_disconnects < 3 - i + 1) { usleep(100); } @@ -858,7 +859,7 @@ reset_testbed(); int num = 1000; - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); SmlTransport *client1 = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); SmlTransport *client2 = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); @@ -875,10 +876,10 @@ smlTransportSetEventCallback(client3, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client1, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(client2, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(client3, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client1, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client2, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client3, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); SmlTransportData *data = NULL; @@ -923,9 +924,9 @@ sml_fail_unless(client_receives == 3 * num, NULL); sml_fail_unless(server_receives == 3 * num, NULL); - sml_fail_unless(smlTransportDisconnect(client1, NULL, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportDisconnect(client2, NULL, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportDisconnect(client3, NULL, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportDisconnect(client1, NULL, &error), "%s", error->message); + sml_fail_unless(smlTransportDisconnect(client2, NULL, &error), "%s", error->message); + sml_fail_unless(smlTransportDisconnect(client3, NULL, &error), "%s", error->message); for (i = g_list_length(links); i > 0; i--) { /* start to disconnect from the end * to avoid conflicts with very fast SMP machines @@ -933,7 +934,7 @@ * that the list will be cleaned up before * this for-loop ends */ - sml_fail_unless(smlTransportDisconnect(server, g_list_nth_data(links, i-1), &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportDisconnect(server, g_list_nth_data(links, i-1), &error), "%s", error->message); while (server_disconnects < (3 * num - i + 1)) { usleep(100); } |
