Menu
▾
▴
[Opensync-commits] r1177 - trunk/tests
|
From: <svn...@op...> - 2009-07-13 12:02:39
|
Author: bellmich Date: Mon Jul 13 14:02:32 2009 New Revision: 1177 URL: http://libsyncml.opensync.org/changeset/1177 Log: migrated check_session from SmlError to GError Modified: trunk/tests/check_session.c Modified: trunk/tests/check_session.c ============================================================================== --- trunk/tests/check_session.c Mon Jul 13 14:01:07 2009 (r1176) +++ trunk/tests/check_session.c Mon Jul 13 14:02:32 2009 (r1177) @@ -154,7 +154,7 @@ { smlTrace(TRACE_INTERNAL, "%s(%p. %p, %p)", __func__, source, callback, user_data); SmlSessionThread *check = user_data; - SmlError *error = NULL; + GError *error = NULL; smlAssert(check != NULL); smlAssert(check->data != NULL); @@ -209,7 +209,7 @@ SmlSessionThread *smlSessionRunAsync(SmlSession *session, SmlTransportData **input) { smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, session, input); - SmlError *error = NULL; + GError *error = NULL; SmlSessionThread *thread = g_malloc0(sizeof(SmlSessionThread)); @@ -290,14 +290,14 @@ SmlManager* _start_manager() { - SmlError *error = NULL; + GError *error = NULL; _tsp = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); - sml_fail_unless(_tsp != NULL, "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(_tsp != NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); SmlManager *manager = smlManagerNew(_tsp, &error); - sml_fail_unless(manager != NULL, "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(manager != NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); smlManagerSetLocalMaxMsgSize(manager, defaultMaxMsgSize); smlManagerSetLocalMaxObjSize(manager, defaultMaxObjSize); @@ -316,14 +316,14 @@ { init_testbed(); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); - 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); sml_fail_unless(session != NULL, NULL); sml_fail_unless(error == NULL, NULL); @@ -338,14 +338,14 @@ { init_testbed(); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); - 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); SmlCommand *cmd = smlCommandNewAlert(SML_ALERT_TWO_WAY, loc, loc, "last", "next", NULL, &error); sml_fail_unless(cmd != NULL, NULL); @@ -362,11 +362,11 @@ } END_TEST -static void _event_callback(SmlSession *session, SmlSessionEventType type, SmlCommand *command, SmlCommand *parent, SmlStatus *reply, SmlError *error, void *userdata) +static void _event_callback(SmlSession *session, SmlSessionEventType type, SmlCommand *command, SmlCommand *parent, SmlStatus *reply, const GError *error, void *userdata) { smlTrace(TRACE_ENTRY, "%s: %d (%p)", __func__, type, parent); smlAssert(GPOINTER_TO_INT(userdata) <= 5); - SmlError *locerror = NULL; + GError *locerror = NULL; switch (type) { case SML_SESSION_EVENT_HEADER_REPLY: @@ -462,7 +462,7 @@ if (GPOINTER_TO_INT(userdata) == 2) g_atomic_int_inc(&errors_received); else { - sml_fail_unless(FALSE, "%s", smlErrorPrint(&error)); + sml_fail_unless(FALSE, "%s", error->message); abort(); } break; @@ -533,14 +533,14 @@ { init_testbed(); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); - 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); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); smlSessionSetDataCallback(session, _data_send_callback, &to_session2); @@ -575,14 +575,14 @@ { init_testbed(); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); - 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); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); smlSessionSetDataCallback(session, _data_send_callback, &to_session2); @@ -618,7 +618,7 @@ { init_testbed(); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -637,7 +637,7 @@ sml_fail_unless(header != NULL, NULL); sml_fail_unless(cred == NULL, NULL); - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); smlSessionSetLocalMaxMsgSize(session, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session, defaultMaxObjSize); @@ -672,14 +672,14 @@ { init_testbed(); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); - 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); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); smlSessionSetDataCallback(session, _data_send_callback, &to_session2); @@ -713,7 +713,7 @@ SmlCred *cred = NULL; sml_fail_unless(smlParserGetHeader(parser, &header, &cred, &error), NULL); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); smlSessionSetLocalMaxMsgSize(session2, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session2, defaultMaxObjSize); @@ -753,16 +753,16 @@ { init_testbed(); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); - 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); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread2 = smlSessionRunAsync(session2, &to_session2); smlSessionSetLocalMaxMsgSize(session2, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session2, defaultMaxObjSize); @@ -832,16 +832,16 @@ { init_testbed(); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); - 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); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread2 = smlSessionRunAsync(session2, &to_session2); smlSessionSetLocalMaxMsgSize(session2, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session2, defaultMaxObjSize); @@ -930,16 +930,16 @@ int num_commands = 1000; - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); - 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); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread2 = smlSessionRunAsync(session2, &to_session2); /* The test is not designed for splitted packages or objects. */ @@ -998,7 +998,7 @@ sml_fail_unless(end_received == 0, NULL); sml_fail_unless(smlSessionFlush(session, TRUE, &error), NULL); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(error == NULL, "%s", error->message); /*while (finals_received != 3) { usleep(100); @@ -1050,16 +1050,16 @@ mutex = g_mutex_new(); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); - 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); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread2 = smlSessionRunAsync(session2, &to_session2); smlSessionSetLocalMaxMsgSize(session, limit); @@ -1178,16 +1178,16 @@ mutex = g_mutex_new(); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); - 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); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread2 = smlSessionRunAsync(session2, &to_session2); smlSessionSetLocalMaxMsgSize(session, limit); @@ -1280,16 +1280,16 @@ setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); - 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); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread2 = smlSessionRunAsync(session2, &to_session2); smlSessionSetLocalMaxMsgSize(session, limit); @@ -1399,7 +1399,7 @@ { init_testbed(); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1418,7 +1418,7 @@ sml_fail_unless(header != NULL, NULL); sml_fail_unless(cred == NULL, NULL); - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_11, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_11, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); smlSessionSetLocalMaxMsgSize(session, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session, defaultMaxObjSize); @@ -1483,7 +1483,7 @@ { init_testbed(); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1502,7 +1502,7 @@ sml_fail_unless(header != NULL, NULL); sml_fail_unless(cred == NULL, NULL); - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_11, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_11, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); smlSessionSetLocalMaxMsgSize(session, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session, defaultMaxObjSize); @@ -1676,7 +1676,7 @@ { init_testbed(); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1695,7 +1695,7 @@ sml_fail_unless(header != NULL, NULL); sml_fail_unless(cred == NULL, NULL); - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_11, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_11, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); smlSessionSetLocalMaxMsgSize(session, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session, defaultMaxObjSize); @@ -1708,7 +1708,7 @@ session->established = TRUE; sml_fail_unless(!smlSessionReceiveBody(session, parser, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); smlHeaderFree(header); @@ -1727,7 +1727,7 @@ { init_testbed(); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1746,7 +1746,7 @@ sml_fail_unless(header != NULL, NULL); sml_fail_unless(cred == NULL, NULL); - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_10, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_10, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); smlSessionSetLocalMaxMsgSize(session, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session, defaultMaxObjSize); @@ -1762,7 +1762,7 @@ sml_fail_unless(!smlSessionReceiveBody(session, parser, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); smlHeaderFree(header); @@ -1785,7 +1785,7 @@ sml_fail_unless(header != NULL, NULL); sml_fail_unless(cred == NULL, NULL); - session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_11, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_11, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); smlSessionSetLocalMaxMsgSize(session, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session, defaultMaxObjSize); @@ -1825,7 +1825,7 @@ { init_testbed(); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1844,7 +1844,7 @@ sml_fail_unless(header != NULL, NULL); sml_fail_unless(cred == NULL, NULL); - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_10, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_10, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); smlSessionSetLocalMaxMsgSize(session, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session, defaultMaxObjSize); @@ -1860,7 +1860,7 @@ sml_fail_unless(!smlSessionReceiveBody(session, parser, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); smlHeaderFree(header); @@ -1887,7 +1887,7 @@ { init_testbed(); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1906,7 +1906,7 @@ sml_fail_unless(header != NULL, NULL); sml_fail_unless(cred == NULL, NULL); - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_11, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_11, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); smlSessionSetLocalMaxMsgSize(session, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session, defaultMaxObjSize); @@ -1922,7 +1922,7 @@ sml_fail_unless(!smlSessionReceiveBody(session, parser, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); smlHeaderFree(header); @@ -1943,7 +1943,7 @@ { init_testbed(); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1962,7 +1962,7 @@ sml_fail_unless(header != NULL, NULL); sml_fail_unless(cred == NULL, NULL); - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_11, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_11, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); smlSessionSetLocalMaxMsgSize(session, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session, defaultMaxObjSize); @@ -2010,7 +2010,7 @@ sml_fail_unless(!smlSessionReceiveBody(session, parser, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); smlHeaderFree(header); @@ -2029,7 +2029,7 @@ { init_testbed(); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -2048,7 +2048,7 @@ sml_fail_unless(header != NULL, NULL); sml_fail_unless(cred == NULL, NULL); - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_11, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_11, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); smlSessionSetLocalMaxMsgSize(session, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session, defaultMaxObjSize); @@ -2096,7 +2096,7 @@ sml_fail_unless(!smlSessionReceiveBody(session, parser, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); smlHeaderFree(header); @@ -2115,7 +2115,7 @@ { init_testbed(); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -2134,7 +2134,7 @@ sml_fail_unless(header != NULL, NULL); sml_fail_unless(cred == NULL, NULL); - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_11, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_11, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); smlSessionSetLocalMaxMsgSize(session, defaultMaxMsgSize); smlSessionSetLocalMaxObjSize(session, defaultMaxObjSize); @@ -2182,7 +2182,7 @@ sml_fail_unless(!smlSessionReceiveBody(session, parser, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); smlHeaderFree(header); @@ -2204,16 +2204,16 @@ int limit = 1000; int objlength = 600; - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); - 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); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread2 = smlSessionRunAsync(session2, &to_session2); smlSessionSetEventCallback(session2, _event_callback, GINT_TO_POINTER(5)); @@ -2289,16 +2289,16 @@ int limit = 1000; int objlength = 4000; - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); - 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); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread2 = smlSessionRunAsync(session2, &to_session2); smlSessionSetEventCallback(session2, _event_callback, GINT_TO_POINTER(5)); @@ -2366,16 +2366,16 @@ int objlength = 1500; int num_obj = 10; - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); - 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); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread2 = smlSessionRunAsync(session2, &to_session2); smlSessionSetEventCallback(session2, _event_callback, GINT_TO_POINTER(5)); @@ -2446,16 +2446,16 @@ int objlength = 1500; int num_obj = 5; - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); - 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); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread2 = smlSessionRunAsync(session2, &to_session2); smlSessionSetEventCallback(session2, _event_callback, GINT_TO_POINTER(5)); @@ -2530,16 +2530,16 @@ { init_testbed(); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); sml_fail_unless(gerror == NULL, NULL); - 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); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); - SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session2 = smlSessionNew(SML_SESSION_TYPE_SERVER, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread2 = smlSessionRunAsync(session2, &to_session2); smlSessionSetLocalMaxMsgSize(session2, defaultMaxMsgSize); @@ -2551,8 +2551,8 @@ smlSessionSetDataCallback(session, _data_send_callback, &to_session2); SmlNotification *san = smlNotificationNew(SML_SAN_VERSION_11, SML_SAN_UIMODE_USER, SML_SAN_INITIATOR_SERVER, 65535, "test", "/", SML_MIMETYPE_XML, &error); - sml_fail_unless(san != NULL, "%s", smlErrorPrint(&error)); - sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(san != NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", error->message); SmlManager *manager = _start_manager(); smlNotificationSetManager(san, manager); |
