From: <svn...@op...> - 2009-07-13 13:01:37
|
Author: bellmich Date: Mon Jul 13 15:01:30 2009 New Revision: 1193 URL: http://libsyncml.opensync.org/changeset/1193 Log: fixed wrong error handling in manager tests Modified: trunk/tests/check_manager.c Modified: trunk/tests/check_manager.c ============================================================================== --- trunk/tests/check_manager.c Mon Jul 13 15:00:48 2009 (r1192) +++ trunk/tests/check_manager.c Mon Jul 13 15:01:30 2009 (r1193) @@ -171,7 +171,7 @@ return; error: - smlTrace(TRACE_EXIT_ERROR, "%s - %s", __func__, error->message); + smlTrace(TRACE_EXIT_ERROR, "%s - %s", __func__, GET_ERROR_MESSAGE(error)); SML_ERROR_FREE(error); return; } @@ -195,8 +195,8 @@ SmlManager *servermanager = servertracker->manager = smlManagerNew(server, &error); smlManagerSetEventCallback(servertracker->manager, _manager_event, servertracker); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -242,7 +242,7 @@ g_free(servertracker); sml_fail_unless(smlTransportFinalize(client, &error), NULL); - sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportFinalize(server, &error), "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(client); smlTransportFree(server); @@ -271,8 +271,8 @@ smlManagerSetLocalMaxObjSize(servertracker->manager, defaultMaxObjSize); smlManagerRegisterHeaderHandler(servermanager, _header_callback, NULL, NULL); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -354,8 +354,8 @@ smlManagerSetLocalMaxObjSize(servertracker->manager, defaultMaxObjSize); smlManagerRegisterHeaderHandler(servermanager, _header_callback, NULL, NULL); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -481,7 +481,7 @@ return; error: - smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, error->message); + smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, GET_ERROR_MESSAGE(error)); if (error) SML_ERROR_FREE(error); } @@ -527,8 +527,8 @@ smlManagerSetLocalMaxMsgSize(servertracker->manager, defaultMaxMsgSize); smlManagerSetLocalMaxObjSize(servertracker->manager, defaultMaxObjSize); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -617,8 +617,8 @@ smlManagerFree(clientmanager); smlManagerFree(servermanager); - sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message); - sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportFinalize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportFinalize(client, &error), "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(server); smlTransportFree(client); @@ -647,8 +647,8 @@ SmlManager *servermanager = servertracker->manager = smlManagerNew(server, &error); smlManagerSetEventCallback(servertracker->manager, _manager_event, servertracker); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); |