Menu
▾
▴
[Opensync-commits] r1182 - trunk/tests
|
From: <svn...@op...> - 2009-07-13 12:15:10
|
Author: bellmich Date: Mon Jul 13 14:15:01 2009 New Revision: 1182 URL: http://libsyncml.opensync.org/changeset/1182 Log: migrated the following tests with the included script from SmlError to GError CHECKS=`ls check_*.c mobiles/*.c` echo -n Reverting to svn status ... svn revert $CHECKS echo DONE. echo Fixing checks: for CHECK in $CHECKS; do echo -n " $CHECK" echo -n . sed --in-place 's%SmlError%GError%' $CHECK echo -n . sed --in-place 's%smlErrorPrint(&error)%error->message%' $CHECK echo -n . sed --in-place 's%smlErrorPrint(&locerror)%locerror->message%' $CHECK echo -n . sed --in-place 's%smlErrorPrint(&eventError)%eventError->message%' $CHECK echo -n . sed --in-place 's%smlErrorPrint(error)%(*error)->message%' $CHECK echo -n . sed --in-place 's%smlErrorDeref(&locerror)%g_error_free(locerror)%' $CHECK echo -n . sed --in-place 's%smlErrorSet%SML_SET_ERROR%' $CHECK echo -n . sed --in-place 's%smlErrorDeref(&error)%SML_ERROR_FREE(error)%' $CHECK echo -n . sed --in-place 's%smlErrorDeref(&newerror)%SML_ERROR_FREE(newerror)%' $CHECK echo -n . sed --in-place 's%loc, loc, NULL%loc, loc, 0%' $CHECK echo -n . sed --in-place 's%loc, loc, "1"%loc, loc, 1%' $CHECK echo -n . sed --in-place 's%smlTransportSetError%smlTransportSendError%' $CHECK echo -n . sed --in-place 's%SmlBool%gboolean%' $CHECK echo DONE. done Modified: trunk/tests/check_data_sync_api.c trunk/tests/check_devinf.c trunk/tests/check_ds.c trunk/tests/check_manager.c trunk/tests/check_md5.c trunk/tests/check_wbxml_assembler.c trunk/tests/check_xml_assembler.c trunk/tests/check_xml_fix_broken_item_data.c Modified: trunk/tests/check_data_sync_api.c ============================================================================== --- trunk/tests/check_data_sync_api.c Mon Jul 13 14:14:20 2009 (r1181) +++ trunk/tests/check_data_sync_api.c Mon Jul 13 14:15:01 2009 (r1182) @@ -47,7 +47,7 @@ /* *********** CALLBACKS ************** */ /* ************************************ */ -SmlBool sendAllChanges( +gboolean sendAllChanges( SmlDataSyncObject *dsObject, GError **error) { @@ -142,7 +142,7 @@ exit(3); } -static SmlBool recvChangeCallback( +static gboolean recvChangeCallback( SmlDataSyncObject *dsObject, const char *source, SmlChangeType type, @@ -213,7 +213,7 @@ // if (o) o = o->next; // } // if (!datastore) { -// smlErrorSet(error, SML_ERROR_GENERIC, +// SML_SET_ERROR(error, SML_ERROR_GENERIC, // "Cannot found datastore %s.", // source); // goto error; Modified: trunk/tests/check_devinf.c ============================================================================== --- trunk/tests/check_devinf.c Mon Jul 13 14:14:20 2009 (r1181) +++ trunk/tests/check_devinf.c Mon Jul 13 14:15:01 2009 (r1182) @@ -43,7 +43,7 @@ unsigned int defaultMaxMsgSize = 10240; unsigned int defaultMaxObjSize = 1024000; -static void _manager_event(SmlManager *manager, SmlManagerEventType type, SmlSession *session, SmlError *error, void *userdata) +static void _manager_event(SmlManager *manager, SmlManagerEventType type, SmlSession *session, GError *error, void *userdata) { smlTrace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p)", __func__, manager, type, session, error, userdata); managerTracker *tracker = userdata; @@ -94,7 +94,7 @@ setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); @@ -113,8 +113,8 @@ smlManagerSetLocalMaxMsgSize(servermanager, defaultMaxMsgSize); smlManagerSetLocalMaxObjSize(servermanager, defaultMaxObjSize); - 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(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -197,8 +197,8 @@ smlSafeFree((gpointer *)&clienttracker); smlSafeFree((gpointer *)&servertracker); - sml_fail_unless(smlTransportFinalize(server, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportFinalize(client, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message); smlTransportFree(server); smlTransportFree(client); @@ -223,7 +223,7 @@ setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); @@ -242,8 +242,8 @@ smlManagerSetLocalMaxMsgSize(servermanager, defaultMaxMsgSize); smlManagerSetLocalMaxObjSize(servermanager, defaultMaxObjSize); - 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(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -304,7 +304,7 @@ smlAuthSetEnable(auth2, FALSE); smlAuthRegister(auth2, servermanager, &error); - clienttracker->session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_11, SML_PROTOCOL_SYNCML, loc, loc, NULL, 0, &error); + clienttracker->session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_11, SML_PROTOCOL_SYNCML, loc, loc, 0, 0, &error); sml_fail_unless(smlManagerSessionAdd(clientmanager, clienttracker->session, NULL, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -382,8 +382,8 @@ smlManagerFree(clientmanager); smlManagerFree(servermanager); - sml_fail_unless(smlTransportFinalize(server, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportFinalize(client, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message); smlTransportFree(server); smlTransportFree(client); Modified: trunk/tests/check_ds.c ============================================================================== --- trunk/tests/check_ds.c Mon Jul 13 14:14:20 2009 (r1181) +++ trunk/tests/check_ds.c Mon Jul 13 14:15:01 2009 (r1182) @@ -245,7 +245,7 @@ smlTrace(TRACE_EXIT, "%s", __func__); } -static SmlBool _recv_alert(SmlDsSession *dsession, SmlAlertType type, const char *last, const char *next, void *userdata) +static gboolean _recv_alert(SmlDsSession *dsession, SmlAlertType type, const char *last, const char *next, void *userdata) { smlTrace(TRACE_ENTRY, "%s(%p, %i, %s, %s, %p)", __func__, dsession, type, VA_STRING(last), VA_STRING(next), userdata); @@ -267,7 +267,7 @@ smlTrace(TRACE_EXIT, "%s", __func__); } -static SmlBool _recv_changes(SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, unsigned int size, const char *contenttype, void *userdata, GError **error) +static gboolean _recv_changes(SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, unsigned int size, const char *contenttype, void *userdata, GError **error) { smlTrace(TRACE_ENTRY, "%s(%p, %i, %s, %s, %i, %s, %p, %p)", __func__, dsession, type, VA_STRING(uid), VA_STRING(data), size, VA_STRING(contenttype), userdata, error); Modified: trunk/tests/check_manager.c ============================================================================== --- trunk/tests/check_manager.c Mon Jul 13 14:14:20 2009 (r1181) +++ trunk/tests/check_manager.c Mon Jul 13 14:15:01 2009 (r1182) @@ -39,7 +39,7 @@ { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); SmlManager *manager = smlManagerNew(server, &error); @@ -56,7 +56,7 @@ { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); SmlManager *manager = smlManagerNew(server, &error); @@ -107,7 +107,7 @@ setup_testbed(NULL); } -static void _manager_event(SmlManager *manager, SmlManagerEventType type, SmlSession *session, SmlError *error, void *userdata) +static void _manager_event(SmlManager *manager, SmlManagerEventType type, SmlSession *session, GError *error, void *userdata) { smlTrace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p)", __func__, manager, type, session, error, userdata); managerTracker *tracker = userdata; @@ -154,7 +154,7 @@ { smlTrace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, session, header, cred, userdata); smlAssert(session); - SmlError *error = NULL; + GError *error = NULL; SmlStatus *reply = smlStatusNew(SML_AUTH_ACCEPTED, 0, session->lastReceivedMessageID, session->source, session->target, SML_COMMAND_TYPE_HEADER, &error); if (!reply) @@ -171,8 +171,8 @@ return; error: - smlTrace(TRACE_EXIT_ERROR, "%s - %s", __func__, smlErrorPrint(&error)); - smlErrorDeref(&error); + smlTrace(TRACE_EXIT_ERROR, "%s - %s", __func__, error->message); + SML_ERROR_FREE(error); return; } @@ -180,7 +180,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); @@ -195,8 +195,8 @@ SmlManager *servermanager = servertracker->manager = smlManagerNew(server, &error); smlManagerSetEventCallback(servertracker->manager, _manager_event, servertracker); - 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(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", smlErrorPrint(&error)); + sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message); smlTransportFree(client); smlTransportFree(server); @@ -253,7 +253,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); @@ -271,8 +271,8 @@ smlManagerSetLocalMaxObjSize(servertracker->manager, defaultMaxObjSize); smlManagerRegisterHeaderHandler(servermanager, _header_callback, NULL, NULL); - 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(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -336,7 +336,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); @@ -354,8 +354,8 @@ smlManagerSetLocalMaxObjSize(servertracker->manager, defaultMaxObjSize); smlManagerRegisterHeaderHandler(servermanager, _header_callback, NULL, NULL); - 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(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -462,7 +462,7 @@ static void _recv_alert(SmlSession *session, SmlCommand *cmd, void *userdata) { smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, cmd, userdata); - SmlError *error = NULL; + GError *error = NULL; num_alerts++; @@ -481,9 +481,9 @@ return; error: - smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(&error)); + smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, error->message); if (error) - smlErrorDeref(&error); + SML_ERROR_FREE(error); } static void _status_reply(SmlSession *session, SmlStatus *status, void *userdata) @@ -510,7 +510,7 @@ reset_testbed(); GError *gerror = NULL; - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); SmlTransport *client = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); @@ -527,8 +527,8 @@ smlManagerSetLocalMaxMsgSize(servertracker->manager, defaultMaxMsgSize); smlManagerSetLocalMaxObjSize(servertracker->manager, defaultMaxObjSize); - 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(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -543,7 +543,7 @@ sml_fail_unless(error == NULL, NULL); smlManagerRegisterHeaderHandler(servermanager, _header_callback, NULL, NULL); - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, NULL, 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 0, 0, &error); sml_fail_unless(smlManagerSessionAdd(clientmanager, session, NULL, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -617,8 +617,8 @@ smlManagerFree(clientmanager); smlManagerFree(servermanager); - sml_fail_unless(smlTransportFinalize(server, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportFinalize(client, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message); smlTransportFree(server); smlTransportFree(client); @@ -630,7 +630,7 @@ reset_testbed(); GError *gerror = NULL; - SmlError *error = NULL; + GError *error = NULL; SmlLocation *loc = sml_location_new_with_options("test", NULL, &gerror); SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); @@ -647,8 +647,8 @@ SmlManager *servermanager = servertracker->manager = smlManagerNew(server, &error); smlManagerSetEventCallback(servertracker->manager, _manager_event, servertracker); - 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(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); Modified: trunk/tests/check_md5.c ============================================================================== --- trunk/tests/check_md5.c Mon Jul 13 14:14:20 2009 (r1181) +++ trunk/tests/check_md5.c Mon Jul 13 14:15:01 2009 (r1182) @@ -25,12 +25,12 @@ { const char *data = ""; unsigned char digest[16]; - SmlError *error = NULL; + GError *error = NULL; smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "d41d8cd98f00b204e9800998ecf8427e"), "%s", smlErrorPrint(&error)); + sml_fail_unless(!strcmp(md5, "d41d8cd98f00b204e9800998ecf8427e"), "%s", error->message); smlSafeCFree(&md5); } END_TEST @@ -39,12 +39,12 @@ { const char *data = "a"; unsigned char digest[16]; - SmlError *error = NULL; + GError *error = NULL; smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "0cc175b9c0f1b6a831c399e269772661"), "%s", smlErrorPrint(&error)); + sml_fail_unless(!strcmp(md5, "0cc175b9c0f1b6a831c399e269772661"), "%s", error->message); smlSafeCFree(&md5); } END_TEST @@ -53,12 +53,12 @@ { const char *data = "abc"; unsigned char digest[16]; - SmlError *error = NULL; + GError *error = NULL; smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "900150983cd24fb0d6963f7d28e17f72"), "%s", smlErrorPrint(&error)); + sml_fail_unless(!strcmp(md5, "900150983cd24fb0d6963f7d28e17f72"), "%s", error->message); smlSafeCFree(&md5); } END_TEST @@ -67,12 +67,12 @@ { const char *data = "message digest"; unsigned char digest[16]; - SmlError *error = NULL; + GError *error = NULL; smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "f96b697d7cb7938d525a2f31aaf161d0"), "%s", smlErrorPrint(&error)); + sml_fail_unless(!strcmp(md5, "f96b697d7cb7938d525a2f31aaf161d0"), "%s", error->message); smlSafeCFree(&md5); } END_TEST @@ -81,12 +81,12 @@ { const char *data = "abcdefghijklmnopqrstuvwxyz"; unsigned char digest[16]; - SmlError *error = NULL; + GError *error = NULL; smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "c3fcd3d76192e4007dfb496cca67e13b"), "%s", smlErrorPrint(&error)); + sml_fail_unless(!strcmp(md5, "c3fcd3d76192e4007dfb496cca67e13b"), "%s", error->message); smlSafeCFree(&md5); } END_TEST @@ -95,12 +95,12 @@ { const char *data = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; unsigned char digest[16]; - SmlError *error = NULL; + GError *error = NULL; smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "d174ab98d277d9f5a5611c2c9f419d9f"), "%s", smlErrorPrint(&error)); + sml_fail_unless(!strcmp(md5, "d174ab98d277d9f5a5611c2c9f419d9f"), "%s", error->message); smlSafeCFree(&md5); } END_TEST @@ -109,12 +109,12 @@ { const char *data = "12345678901234567890123456789012345678901234567890123456789012345678901234567890"; unsigned char digest[16]; - SmlError *error = NULL; + GError *error = NULL; smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "57edf4a22be3c955ac49da2e2107b67a"), "%s", smlErrorPrint(&error)); + sml_fail_unless(!strcmp(md5, "57edf4a22be3c955ac49da2e2107b67a"), "%s", error->message); smlSafeCFree(&md5); } END_TEST Modified: trunk/tests/check_wbxml_assembler.c ============================================================================== --- trunk/tests/check_wbxml_assembler.c Mon Jul 13 14:14:20 2009 (r1181) +++ trunk/tests/check_wbxml_assembler.c Mon Jul 13 14:15:01 2009 (r1182) @@ -29,7 +29,7 @@ static SmlAssembler *start_assembler(SmlSession *session, unsigned int limit) { - SmlError *error = NULL; + GError *error = NULL; SmlAssembler *assm = smlAssemblerNew(SML_MIMETYPE_WBXML, limit, &error); sml_fail_unless(assm != NULL, NULL); @@ -46,7 +46,7 @@ START_TEST (wbxml_assembler_message_empty) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -56,7 +56,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); g_object_unref(loc); SmlAssembler *assm = start_assembler(session, 0); @@ -66,14 +66,14 @@ unsigned int size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(smlAssemblerFlush(assm) == 1, NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -83,7 +83,7 @@ START_TEST (wbxml_assembler_message_only_header) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -93,7 +93,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); g_object_unref(loc); SmlAssembler *assm = start_assembler(session, 0); @@ -106,14 +106,14 @@ unsigned int size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(smlAssemblerFlush(assm) == 1, NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -123,7 +123,7 @@ START_TEST (wbxml_assembler_message_status) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -133,7 +133,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); g_object_unref(loc); SmlAssembler *assm = start_assembler(session, 0); @@ -167,7 +167,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -177,7 +177,7 @@ START_TEST (wbxml_assembler_message_cmd) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -187,7 +187,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -229,7 +229,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -239,7 +239,7 @@ START_TEST (wbxml_assembler_message_subcmd) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -249,7 +249,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -295,7 +295,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -305,7 +305,7 @@ START_TEST (wbxml_assembler_message_several_subcmd) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -315,7 +315,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -401,7 +401,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -411,7 +411,7 @@ START_TEST (wbxml_assembler_message_flush_open) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -421,7 +421,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -484,7 +484,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -494,7 +494,7 @@ START_TEST (wbxml_assembler_out_of_order) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -504,7 +504,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -600,7 +600,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -610,7 +610,7 @@ START_TEST (wbxml_assembler_limit1) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -620,20 +620,20 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 1); sml_fail_unless(assm != NULL, NULL); sml_fail_unless(!smlAssemblerAddHeader(assm, session, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); char *data = NULL; unsigned int size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -643,7 +643,7 @@ START_TEST (wbxml_assembler_limit2) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -653,20 +653,20 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 50); sml_fail_unless(assm != NULL, NULL); sml_fail_unless(!smlAssemblerAddHeader(assm, session, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); char *data = NULL; unsigned int size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -676,7 +676,7 @@ START_TEST (wbxml_assembler_limit3) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -686,7 +686,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 100); sml_fail_unless(assm != NULL, NULL); @@ -710,7 +710,7 @@ unsigned int size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -720,7 +720,7 @@ START_TEST (wbxml_assembler_limit4) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -730,7 +730,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 380); sml_fail_unless(assm != NULL, NULL); @@ -764,7 +764,7 @@ START_TEST (wbxml_assembler_limit5) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -774,7 +774,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 150); sml_fail_unless(assm != NULL, NULL); @@ -836,7 +836,7 @@ START_TEST (wbxml_assembler_complex1) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -846,7 +846,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); Modified: trunk/tests/check_xml_assembler.c ============================================================================== --- trunk/tests/check_xml_assembler.c Mon Jul 13 14:14:20 2009 (r1181) +++ trunk/tests/check_xml_assembler.c Mon Jul 13 14:15:01 2009 (r1182) @@ -26,7 +26,7 @@ static SmlAssembler *start_assembler(SmlSession *session, unsigned int limit) { - SmlError *error = NULL; + GError *error = NULL; SmlAssembler *assm = smlAssemblerNew(SML_MIMETYPE_XML, limit, &error); sml_fail_unless(assm != NULL, NULL); @@ -43,7 +43,7 @@ START_TEST (xml_assembler_message_empty) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -53,7 +53,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); g_object_unref(loc); @@ -64,14 +64,14 @@ unsigned int size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(smlAssemblerFlush(assm) == 1, NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -81,7 +81,7 @@ START_TEST (xml_assembler_message_only_header) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -91,7 +91,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); g_object_unref(loc); @@ -105,14 +105,14 @@ unsigned int size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(smlAssemblerFlush(assm) == 1, NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -122,7 +122,7 @@ START_TEST (xml_assembler_message_status) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -132,7 +132,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -168,7 +168,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -178,7 +178,7 @@ START_TEST (xml_assembler_message_cmd) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -188,7 +188,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -225,7 +225,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -235,7 +235,7 @@ START_TEST (xml_assembler_message_subcmd) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -245,7 +245,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -295,7 +295,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -305,7 +305,7 @@ START_TEST (xml_assembler_message_several_subcmd) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -315,7 +315,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -409,7 +409,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -419,7 +419,7 @@ START_TEST (xml_assembler_message_flush_open) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -429,7 +429,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -501,7 +501,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -522,7 +522,7 @@ START_TEST (xml_assembler_out_of_order) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -532,7 +532,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -636,7 +636,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -646,7 +646,7 @@ START_TEST (xml_assembler_limit1) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -656,7 +656,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); g_object_unref(loc); @@ -665,13 +665,13 @@ sml_fail_unless(!smlAssemblerAddHeader(assm, session, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); char *data = NULL; unsigned int size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -681,7 +681,7 @@ START_TEST (xml_assembler_limit2) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -691,7 +691,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); g_object_unref(loc); @@ -700,13 +700,13 @@ sml_fail_unless(!smlAssemblerAddHeader(assm, session, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); char *data = NULL; unsigned int size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -716,7 +716,7 @@ START_TEST (xml_assembler_limit3) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -726,7 +726,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 220); sml_fail_unless(assm != NULL, NULL); @@ -752,7 +752,7 @@ unsigned int size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -762,7 +762,7 @@ START_TEST (xml_assembler_limit4) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -772,7 +772,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 380); sml_fail_unless(assm != NULL, NULL); @@ -809,7 +809,7 @@ START_TEST (xml_assembler_limit5) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -819,7 +819,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 500); sml_fail_unless(assm != NULL, NULL); @@ -884,7 +884,7 @@ START_TEST (xml_assembler_devinf) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -894,7 +894,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -958,7 +958,7 @@ START_TEST (xml_assembler_devinf12) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -968,7 +968,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -1032,7 +1032,7 @@ START_TEST (xml_assembler_order) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1042,7 +1042,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -1097,7 +1097,7 @@ smlSessionUnref(session); SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(parser != NULL, "%s", error->message); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -1134,8 +1134,8 @@ sml_fail_unless(status == NULL, NULL); sml_fail_unless(error == NULL, NULL); - SmlBool final = TRUE; - SmlBool end = TRUE; + gboolean final = TRUE; + gboolean end = TRUE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == FALSE, NULL); @@ -1160,7 +1160,7 @@ START_TEST (xml_assembler_reuse) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1170,7 +1170,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -1199,7 +1199,7 @@ sml_fail_unless(error != NULL, NULL); sml_fail_unless(data == NULL, NULL); sml_fail_unless(size == 0, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(smlAssemblerAddStatus(assm, status, &error) == SML_ASSEMBLER_RESULT_OK, NULL); sml_fail_unless(error == NULL, NULL); @@ -1213,7 +1213,7 @@ sml_fail_unless(error != NULL, NULL); sml_fail_unless(data == NULL, NULL); sml_fail_unless(size == 0, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); /* Must work */ sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL); @@ -1229,7 +1229,7 @@ sml_fail_unless(smlAssemblerIsStatusMissing(assm) == TRUE, NULL); SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(parser != NULL, "%s", error->message); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -1252,8 +1252,8 @@ sml_fail_unless(status == NULL, NULL); sml_fail_unless(error == NULL, NULL); - SmlBool final = TRUE; - SmlBool end = TRUE; + gboolean final = TRUE; + gboolean end = TRUE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == FALSE, NULL); @@ -1293,7 +1293,7 @@ smlSessionUnref(session); parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(parser != NULL, "%s", error->message); header = NULL; sml_fail_unless(smlParserGetHeader(parser, &header, &cred, &error), NULL); @@ -1338,7 +1338,7 @@ START_TEST (xml_assembler_leak) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1348,7 +1348,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -1370,7 +1370,7 @@ sml_fail_unless(error != NULL, NULL); sml_fail_unless(data == NULL, NULL); sml_fail_unless(size == 0, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(smlAssemblerFlush(assm) == 4, NULL); sml_fail_unless(error == NULL, NULL); @@ -1389,7 +1389,7 @@ sml_fail_unless(smlAssemblerAddStatus(assm, status, &error) != SML_ASSEMBLER_RESULT_OK, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlStatusUnref(status); @@ -1398,7 +1398,7 @@ sml_fail_unless(error != NULL, NULL); sml_fail_unless(data == NULL, NULL); sml_fail_unless(size == 0, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(smlAssemblerFlush(assm) == 1, NULL); sml_fail_unless(error == NULL, NULL); @@ -1442,7 +1442,7 @@ int num_cmd = 1000; int num_status = 1000; - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1452,7 +1452,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -1505,7 +1505,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); g_object_unref(loc); smlAssemblerFree(assm); @@ -1521,7 +1521,7 @@ int limit = 50000; - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1531,7 +1531,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, limit); sml_fail_unless(assm != NULL, NULL); @@ -1564,7 +1564,7 @@ sml_fail_unless(smlAssemblerAddStatus(assm, status, &error) == SML_ASSEMBLER_RESULT_OK, NULL); sml_fail_unless(error == NULL, NULL); } else if (res != SML_ASSEMBLER_RESULT_OK) { - sml_fail_unless(FALSE, "%s", smlErrorPrint(&error)); + sml_fail_unless(FALSE, "%s", error->message); } smlStatusUnref(status); @@ -1594,7 +1594,7 @@ sml_fail_unless(smlAssemblerStartCommand(assm, NULL, cmd1, &error), NULL); sml_fail_unless(error == NULL, NULL); } else if (res != SML_ASSEMBLER_RESULT_OK) { - sml_fail_unless(FALSE, "%s", smlErrorPrint(&error)); + sml_fail_unless(FALSE, "%s", error->message); } smlCommandUnref(cmd1); @@ -1617,7 +1617,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); g_object_unref(loc); smlAssemblerFree(assm); @@ -1633,7 +1633,7 @@ int limit = 500000000; - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1643,7 +1643,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, limit); sml_fail_unless(assm != NULL, NULL); @@ -1695,7 +1695,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); g_object_unref(loc); smlAssemblerFree(assm); @@ -1708,7 +1708,7 @@ setup_testbed(NULL); int limit = 500000; - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1718,7 +1718,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, limit); sml_fail_unless(assm != NULL, NULL); @@ -1767,7 +1767,7 @@ sml_fail_unless(!smlAssemblerStartCommand(assm, cmd1, cmd2, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlCommandUnref(cmd2); @@ -1793,7 +1793,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); g_object_unref(loc); smlAssemblerFree(assm); Modified: trunk/tests/check_xml_fix_broken_item_data.c ============================================================================== --- trunk/tests/check_xml_fix_broken_item_data.c Mon Jul 13 14:14:20 2009 (r11... [truncated message content] |
