Menu
▾
▴
[Opensync-commits] r1029 - in trunk/tests: . mobiles
|
From: <svn...@op...> - 2009-04-03 15:12:39
|
Author: bellmich Date: Fri Apr 3 17:12:26 2009 New Revision: 1029 URL: http://libsyncml.opensync.org/changeset/1029 Log: fixed warnings from gcc during profiling build Modified: trunk/tests/check_data_sync_api.c trunk/tests/check_devinf.c trunk/tests/check_ds.c trunk/tests/check_http.c trunk/tests/check_libsoup.c trunk/tests/check_manager.c trunk/tests/check_md5.c trunk/tests/check_obex.c trunk/tests/check_session.c trunk/tests/check_sync.c trunk/tests/check_wbxml_parser.c trunk/tests/check_xml_parser.c trunk/tests/mobiles/libsyncml_ds_server.c trunk/tests/mobiles/obex_mobile_ds_client.c trunk/tests/support.c trunk/tests/support.h Modified: trunk/tests/check_data_sync_api.c ============================================================================== --- trunk/tests/check_data_sync_api.c Fri Apr 3 15:50:32 2009 (r1028) +++ trunk/tests/check_data_sync_api.c Fri Apr 3 17:12:26 2009 (r1029) @@ -40,7 +40,7 @@ SmlDataSyncObject *server; const char *client_source; const char *server_source; -char *transport; +const char *transport; /* ************************************ */ @@ -148,7 +148,7 @@ void *userdata, SmlError **error) { - smlTrace(TRACE_ENTRY, "%s(%s: %s)", __func__, VA_STRING(source), VA_STRING(uid)); + smlTrace(TRACE_ENTRY, "%s: %s ==> %s(%p, %d, %p, %d, %p, %p)", __func__, VA_STRING(source), VA_STRING(uid), dsObject, type, data, size, userdata, error); /* clients should never receive a change in this test */ @@ -400,7 +400,7 @@ goto error; /* configure test data */ - client_items = g_list_append(client_items, "blabla"); + client_items = g_list_append(client_items, (char *) "blabla"); run_testbed(); @@ -439,7 +439,7 @@ goto error; /* configure test data */ - client_items = g_list_append(client_items, "this is an image"); + client_items = g_list_append(client_items, (char *) "this is an image"); run_testbed(); @@ -475,7 +475,7 @@ goto error; /* configure test data */ - client_items = g_list_append(client_items, "this is some data"); + client_items = g_list_append(client_items, (char *) "this is some data"); run_testbed(); @@ -514,7 +514,7 @@ int max_items = 10000; int i; for(i = 0; i < max_items; i++) { - client_items = g_list_append(client_items, "client data"); + client_items = g_list_append(client_items, (char *) "client data"); } run_testbed(); Modified: trunk/tests/check_devinf.c ============================================================================== --- trunk/tests/check_devinf.c Fri Apr 3 15:50:32 2009 (r1028) +++ trunk/tests/check_devinf.c Fri Apr 3 17:12:26 2009 (r1029) @@ -145,9 +145,9 @@ smlLocationUnref(loc); - char *datastr = "<?xml version=\"1.0\"?><!DOCTYPE SyncML PUBLIC \"-//SYNCML//DTD SyncML 1.1//EN\" \"http://www.syncml.org/docs/syncml_represent_v11_20020213.dtd\"><SyncML xmlns=\"syncml:SYNCML1.1\"><SyncHdr><VerDTD>1.1</VerDTD><VerProto>SyncML/1.1</VerProto><SessionID>10</SessionID><MsgID>1</MsgID><Target><LocURI>PC Suite</LocURI></Target><Source><LocURI>IMEI:xxxxxxxxxxxxxxx</LocURI></Source><Meta><MaxMsgSize xmlns=\"syncml:metinf\">10000</MaxMsgSize></Meta></SyncHdr><SyncBody><Status><CmdID>1</CmdID><MsgRef>1</MsgRef><CmdRef>0</CmdRef><Cmd>SyncHdr</Cmd><TargetRef>/</TargetRef><SourceRef>PC Suite</SourceRef><Data>200</Data></Status><Status><CmdID>2</CmdID><MsgRef>1</MsgRef><CmdRef>1</CmdRef><Cmd>Alert</Cmd><SourceRef>Contacts</SourceRef><Data>200</Data></Status><Alert><CmdID>3</CmdID><Data>201</Data><Item><Target><LocURI>./Contacts</LocURI></Target><Source><LocURI>./C\\System\\Data\\Contacts.cdb</LocURI></Source><Meta><Anchor xmlns=\"syncml:metinf\"><Last></Last><Next>20060317T083025Z</Next></Anchor></Meta></Item></Alert><Put><CmdID>4</CmdID><Meta><Type xmlns=\"syncml:metinf\">application/vnd.syncml-devinf+xml</Type></Meta><Item><Source><LocURI>./devinf11</LocURI></Source><Data><DevInf xmlns=\"syncml:devinf\"><VerDTD>1.1</VerDTD><Man>NOKIA</Man><Mod>6680</Mod><SwV>2.04.15</SwV><DevID>IMEI:xxxxxxxxxxxxxxx</DevID><DevTyp>phone</DevTyp><SupportLargeObjs></SupportLargeObjs><SupportNumberOfChanges></SupportNumberOfChanges><DataStore><SourceRef>./C\\System\\Data\\Contacts.cdb</SourceRef><MaxGUIDSize>8</MaxGUIDSize><Rx-Pref><CTType>text/x-vcard</CTType><VerCT>2.1</VerCT></Rx-Pref><Rx><CTType>text/vcard</CTType><VerCT>3.0</VerCT></Rx><Tx-Pref><CTType>text/x-vcard</CTType><VerCT>2.1</VerCT></Tx-Pref><SyncCap><SyncType>1</SyncType><SyncType>2</SyncType><SyncType>3</SyncType><SyncType>4</SyncType><SyncType>5</SyncType><SyncType>6</SyncType><SyncType>7</SyncType></SyncCap></DataStore><CTCap><CTType>text/x-vcard</CTType><PropName>BEGIN</PropName><ValEnum>VCARD</ValEnum><PropName>END</PropName><ValEnum>VCARD</ValEnum><PropName>VERSION</PropName><ValEnum>2.1</ValEnum><PropName>REV</PropName><PropName>N</PropName><PropName>ADR</PropName><ParamName>HOME</ParamName><ParamName>WORK</ParamName><PropName>TEL</PropName><ParamName>HOME</ParamName><ParamName>WORK</ParamName><ParamName>CELL</ParamName><ParamName>PAGER</ParamName><ParamName>FAX</ParamName><ParamName>VIDEO</ParamName><PropName>FN</PropName><PropName>EMAIL</PropName><ParamName>INTERNET</ParamName><ParamName>HOME</ParamName><ParamName>WORK</ParamName><PropName>URL</PropName><ParamName>HOME</ParamName><ParamName>WORK</ParamName><PropName>NOTE</PropName><PropName>TITLE</PropName><PropName>ORG</PropName><PropName>PHOTO</PropName><PropName>BDAY</PropName><PropName>SOUND</PropName><ParamName>X-IRMC-N</ParamName><CTType>text/vcard</CTType><PropName>BEGIN</PropName><ValEnum>VCARD</ValEnum><PropName>END</PropName><ValEnum>VCARD</ValEnum><PropName>VERSION</PropName><ValEnum>3.0</ValEnum><PropName>REV</PropName><PropName>N</PropName><PropName>ADR</PropName><ParamName>HOME</ParamName><ParamName>WORK</ParamName><PropName>TEL</PropName><ParamName>HOME</ParamName><ParamName>WORK</ParamName><ParamName>CELL</ParamName><ParamName>PAGER</ParamName><ParamName>FAX</ParamName><ParamName>VIDEO</ParamName><PropName>FN</PropName><PropName>EMAIL</PropName><ParamName>INTERNET</ParamName><ParamName>HOME</ParamName><ParamName>WORK</ParamName><PropName>URL</PropName><ParamName>HOME</ParamName><ParamName>WORK</ParamName><PropName>NOTE</PropName><PropName>TITLE</PropName><PropName>ORG</PropName><PropName>PHOTO</PropName><PropName>BDAY</PropName><PropName>SOUND</PropName><ParamName>X-IRMC-N</ParamName></CTCap></DevInf></Data></Item></Put><Get><CmdID>5</CmdID><Meta><Type xmlns=\"syncml:metinf\">application/vnd.syncml-devinf+xml</Type></Meta><Item><Target><LocURI>./devinf11</LocURI></Target></Item></Get><Final></Final></SyncBody></SyncML>"; + const char *datastr = "<?xml version=\"1.0\"?><!DOCTYPE SyncML PUBLIC \"-//SYNCML//DTD SyncML 1.1//EN\" \"http://www.syncml.org/docs/syncml_represent_v11_20020213.dtd\"><SyncML xmlns=\"syncml:SYNCML1.1\"><SyncHdr><VerDTD>1.1</VerDTD><VerProto>SyncML/1.1</VerProto><SessionID>10</SessionID><MsgID>1</MsgID><Target><LocURI>PC Suite</LocURI></Target><Source><LocURI>IMEI:xxxxxxxxxxxxxxx</LocURI></Source><Meta><MaxMsgSize xmlns=\"syncml:metinf\">10000</MaxMsgSize></Meta></SyncHdr><SyncBody><Status><CmdID>1</CmdID><MsgRef>1</MsgRef><CmdRef>0</CmdRef><Cmd>SyncHdr</Cmd><TargetRef>/</TargetRef><SourceRef>PC Suite</SourceRef><Data>200</Data></Status><Status><CmdID>2</CmdID><MsgRef>1</MsgRef><CmdRef>1</CmdRef><Cmd>Alert</Cmd><SourceRef>Contacts</SourceRef><Data>200</Data></Status><Alert><CmdID>3</CmdID><Data>201</Data><Item><Target><LocURI>./Contacts</LocURI></Target><Source><LocURI>./C\\System\\Data\\Contacts.cdb</LocURI></Source><Meta><Anchor xmlns=\"syncml:metinf\"><Last></Last><Next>20060317T083025Z</Next></Anchor></Meta></Item></Alert><Put><CmdID>4</CmdID><Meta><Type xmlns=\"syncml:metinf\">application/vnd.syncml-devinf+xml</Type></Meta><Item><Source><LocURI>./devinf11</LocURI></Source><Data><DevInf xmlns=\"syncml:devinf\"><VerDTD>1.1</VerDTD><Man>NOKIA</Man><Mod>6680</Mod><SwV>2.04.15</SwV><DevID>IMEI:xxxxxxxxxxxxxxx</DevID><DevTyp>phone</DevTyp><SupportLargeObjs></SupportLargeObjs><SupportNumberOfChanges></SupportNumberOfChanges><DataStore><SourceRef>./C\\System\\Data\\Contacts.cdb</SourceRef><MaxGUIDSize>8</MaxGUIDSize><Rx-Pref><CTType>text/x-vcard</CTType><VerCT>2.1</VerCT></Rx-Pref><Rx><CTType>text/vcard</CTType><VerCT>3.0</VerCT></Rx><Tx-Pref><CTType>text/x-vcard</CTType><VerCT>2.1</VerCT></Tx-Pref><SyncCap><SyncType>1</SyncType><SyncType>2</SyncType><SyncType>3</SyncType><SyncType>4</SyncType><SyncType>5</SyncType><SyncType>6</SyncType><SyncType>7</SyncType></SyncCap></DataStore><CTCap><CTType>text/x-vcard</CTType><PropName>BEGIN</PropName><ValEnum>VCARD</ValEnum><PropName>END</PropName><ValEnum>VCARD</ValEnum><PropName>VERSION</PropName><ValEnum>2.1</ValEnum><PropName>REV</PropName><PropName>N</PropName><PropName>ADR</PropName><ParamName>HOME</ParamName><ParamName>WORK</ParamName><PropName>TEL</PropName><ParamName>HOME</ParamName><ParamName>WORK</ParamName><ParamName>CELL</ParamName><ParamName>PAGER</ParamName><ParamName>FAX</ParamName><ParamName>VIDEO</ParamName><PropName>FN</PropName><PropName>EMAIL</PropName><ParamName>INTERNET</ParamName><ParamName>HOME</ParamName><ParamName>WORK</ParamName><PropName>URL</PropName><ParamName>HOME</ParamName><ParamName>WORK</ParamName><PropName>NOTE</PropName><PropName>TITLE</PropName><PropName>ORG</PropName><PropName>PHOTO</PropName><PropName>BDAY</PropName><PropName>SOUND</PropName><ParamName>X-IRMC-N</ParamName><CTType>text/vcard</CTType><PropName>BEGIN</PropName><ValEnum>VCARD</ValEnum><PropName>END</PropName><ValEnum>VCARD</ValEnum><PropName>VERSION</PropName><ValEnum>3.0</ValEnum><PropName>REV</PropName><PropName>N</PropName><PropName>ADR</PropName><ParamName>HOME</ParamName><ParamName>WORK</ParamName><PropName>TEL</PropName><ParamName>HOME</ParamName><ParamName>WORK</ParamName><ParamName>CELL</ParamName><ParamName>PAGER</ParamName><ParamName>FAX</ParamName><ParamName>VIDEO</ParamName><PropName>FN</PropName><PropName>EMAIL</PropName><ParamName>INTERNET</ParamName><ParamName>HOME</ParamName><ParamName>WORK</ParamName><PropName>URL</PropName><ParamName>HOME</ParamName><ParamName>WORK</ParamName><PropName>NOTE</PropName><PropName>TITLE</PropName><PropName>ORG</PropName><PropName>PHOTO</PropName><PropName>BDAY</PropName><PropName>SOUND</PropName><ParamName>X-IRMC-N</ParamName></CTCap></DevInf></Data></Item></Put><Get><CmdID>5</CmdID><Meta><Type xmlns=\"syncml:metinf\">application/vnd.syncml-devinf+xml</Type></Meta><Item><Target><LocURI>./devinf11</LocURI></Target></Item></Get><Final></Final></SyncBody></SyncML>"; - SmlTransportData *data = smlTransportDataNew(datastr, strlen(datastr), SML_MIMETYPE_XML, FALSE, &error); + SmlTransportData *data = smlTransportDataNew((char *)datastr, strlen(datastr), SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, NULL); Modified: trunk/tests/check_ds.c ============================================================================== --- trunk/tests/check_ds.c Fri Apr 3 15:50:32 2009 (r1028) +++ trunk/tests/check_ds.c Fri Apr 3 17:12:26 2009 (r1029) @@ -71,6 +71,7 @@ gboolean _session_prepare(GSource *source, gint *timeout_) { + smlTrace(TRACE_INTERNAL, "%s(%p, %p)", __func__, source, timeout_); *timeout_ = 1; return FALSE; } @@ -83,6 +84,7 @@ gboolean _session_dispatch(GSource *source, GSourceFunc callback, gpointer user_data) { + smlTrace(TRACE_INTERNAL, "%s(%p, %p)", __func__, source, callback); SmlSession *session = user_data; while (smlSessionCheck(session)) @@ -92,6 +94,7 @@ } gboolean _data_prepare(GSource *source, gint *timeout_) { + smlTrace(TRACE_INTERNAL, "%s(%p, %p)", __func__, source, timeout_); *timeout_ = 1; return FALSE; } @@ -110,6 +113,7 @@ gboolean _data_dispatch(GSource *source, GSourceFunc callback, gpointer user_data) { + smlTrace(TRACE_INTERNAL, "%s(%p, %p)", __func__, source, callback); SmlSessionThread *check = user_data; SmlError *error = NULL; smlAssert(check != NULL); @@ -253,7 +257,7 @@ static void _recv_sync(SmlDsSession *dsession, unsigned int numChanges, void *userdata) { - smlTrace(TRACE_ENTRY, "%s()", __func__); + smlTrace(TRACE_ENTRY, "%s(%p, %d, %p)", __func__,dsession, numChanges, userdata); g_atomic_int_add(&syncs_received, 1); @@ -292,7 +296,7 @@ static void _alert_reply(SmlSession *dsession, SmlStatus *status, void *userdata) { - smlTrace(TRACE_ENTRY, "%s()", __func__); + smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, dsession, status, userdata); sml_fail_unless(status != NULL, NULL); @@ -309,7 +313,7 @@ static void _sync_reply(SmlSession *dsession, SmlStatus *status, void *userdata) { - smlTrace(TRACE_ENTRY, "%s()", __func__); + smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, dsession, status, userdata); sml_fail_unless(status != NULL, NULL); @@ -375,7 +379,7 @@ static void _map_reply(SmlSession *dsession, SmlStatus *status, void *userdata) { - smlTrace(TRACE_ENTRY, "%s()", __func__); + smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, dsession, status, userdata); sml_fail_unless(status != NULL, NULL); sml_fail_unless(smlStatusGetClass(status) == SML_ERRORCLASS_SUCCESS, NULL); @@ -419,7 +423,7 @@ static void _event_callback(SmlSession *session, SmlSessionEventType type, SmlCommand *command, SmlCommand *parent, SmlStatus *reply, SmlError *error, void *userdata) { - smlTrace(TRACE_ENTRY, "%s()", __func__); + smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, parent, reply); _server_corr *corr = userdata; Modified: trunk/tests/check_http.c ============================================================================== --- trunk/tests/check_http.c Fri Apr 3 15:50:32 2009 (r1028) +++ trunk/tests/check_http.c Fri Apr 3 17:12:26 2009 (r1029) @@ -147,9 +147,9 @@ } END_TEST -SmlBool _recv_client_event(SmlTransport *tsp, SmlLink *link, SmlTransportEventType type, SmlTransportData *data, SmlError *error, void *userdata) +SmlBool _recv_client_event(SmlTransport *tsp, SmlLink *link_, SmlTransportEventType type, SmlTransportData *data, SmlError *error, void *userdata) { - smlTrace(TRACE_ENTRY, "%s(%d)", __func__, type); + smlTrace(TRACE_ENTRY, "%s(%p, %p, %d)", __func__, tsp, link_, type); sml_fail_unless(GPOINTER_TO_INT(userdata) == 1, NULL); @@ -179,22 +179,22 @@ return TRUE; } -SmlBool _recv_server_event(SmlTransport *tsp, SmlLink *link, SmlTransportEventType type, SmlTransportData *data, SmlError *error, void *userdata) +SmlBool _recv_server_event(SmlTransport *tsp, SmlLink *link_, SmlTransportEventType type, SmlTransportData *data, SmlError *error, void *userdata) { - smlTrace(TRACE_ENTRY, "%s(%p, %d)", __func__, link, type); + smlTrace(TRACE_ENTRY, "%s(%p, %d, %p)", __func__, link_, type, error); SmlError *locerror = NULL; SmlLink *last = NULL; switch (type) { case SML_TRANSPORT_EVENT_CONNECT_DONE: g_atomic_int_inc(&server_connects); - links = g_list_append(links, link); - smlLinkRef(link); + links = g_list_append(links, link_); + smlLinkRef(link_); break; case SML_TRANSPORT_EVENT_DISCONNECT_DONE: /* only real connections must be managed */ last = g_list_nth_data(links, g_list_length(links)-1); - sml_fail_unless(last == link, "The disconnected links do not match."); + sml_fail_unless(last == link_, "The disconnected links do not match."); links = g_list_remove(links, last); smlLinkDeref(last); g_atomic_int_inc(&server_disconnects); @@ -205,34 +205,34 @@ if (!strcmp(data->data, "test")) { sml_fail_unless(data->size == 5, NULL); sml_fail_unless(data->type == SML_MIMETYPE_XML, NULL); - sml_fail_unless(link != NULL, NULL); + sml_fail_unless(link_ != NULL, NULL); if (GPOINTER_TO_INT(userdata) == 1) { - data = smlTransportDataNew("answer", 7, SML_MIMETYPE_WBXML, FALSE, &locerror); + 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(smlTransportSend(tsp, link, data, &locerror), "%s", smlErrorPrint(&locerror)); + sml_fail_unless(smlTransportSend(tsp, link_, data, &locerror), "%s", smlErrorPrint(&locerror)); smlTransportDataDeref(data); } else if (GPOINTER_TO_INT(userdata) == 2) { SmlError *newerror = NULL; smlErrorSet(&newerror, SML_ERROR_GENERIC, "test"); - smlTransportSetError(tsp, link, &newerror); + smlTransportSetError(tsp, link_, &newerror); smlErrorDeref(&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", smlErrorPrint(&locerror)); } else { sml_fail_unless(FALSE, "Some unexpected userdata %i was detected.", GPOINTER_TO_INT(userdata)); } } else if (!strcmp(data->data, "error")) { sml_fail_unless(data->size == 6, NULL); sml_fail_unless(data->type == SML_MIMETYPE_XML, NULL); - sml_fail_unless(link != NULL, NULL); + sml_fail_unless(link_ != NULL, NULL); SmlError *newerror = NULL; smlErrorSet(&newerror, SML_ERROR_GENERIC, "test2"); - smlTransportSetError(tsp, link, &newerror); + smlTransportSetError(tsp, link_, &newerror); smlErrorDeref(&newerror); } else { sml_fail_unless(FALSE, "The received data was not expected (%s).", data->data); @@ -360,7 +360,7 @@ sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); - SmlTransportData *data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, NULL); @@ -409,7 +409,7 @@ sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); - SmlTransportData *data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, NULL); @@ -459,7 +459,7 @@ sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); - SmlTransportData *data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, NULL); @@ -517,7 +517,7 @@ int i; for (i = 0; i < 20; i++) { - data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, NULL); @@ -580,7 +580,7 @@ sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); - SmlTransportData *data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, NULL); @@ -620,7 +620,7 @@ sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); - SmlTransportData *data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, NULL); @@ -679,21 +679,21 @@ sml_fail_unless(smlTransportInitialize(client3, &error), "%s", smlErrorPrint(&error)); sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); - SmlTransportData *data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(smlTransportSend(client1, NULL, data, &error), NULL); sml_fail_unless(error == NULL, NULL); smlTransportDataDeref(data); - data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(smlTransportSend(client2, NULL, data, &error), NULL); sml_fail_unless(error == NULL, NULL); smlTransportDataDeref(data); - data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(smlTransportSend(client3, NULL, data, &error), NULL); @@ -771,14 +771,14 @@ sml_fail_unless(smlTransportInitialize(client3, &error), "%s", smlErrorPrint(&error)); sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); - SmlTransportData *data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(smlTransportSend(client1, NULL, data, &error), NULL); sml_fail_unless(error == NULL, NULL); smlTransportDataDeref(data); - data = smlTransportDataNew("error", 6, SML_MIMETYPE_XML, FALSE, &error); + data = smlTransportDataNew((char *)"error", 6, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(smlTransportSend(client2, NULL, data, &error), NULL); @@ -786,7 +786,7 @@ smlTransportDataDeref(data); - data = smlTransportDataNew("error", 6, SML_MIMETYPE_XML, FALSE, &error); + data = smlTransportDataNew((char *)"error", 6, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(smlTransportSend(client3, NULL, data, &error), NULL); @@ -868,21 +868,21 @@ int i; for (i = 0; i < num; i++) { - data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(smlTransportSend(client1, NULL, data, &error), NULL); sml_fail_unless(error == NULL, NULL); smlTransportDataDeref(data); - data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(smlTransportSend(client2, NULL, data, &error), NULL); sml_fail_unless(error == NULL, NULL); smlTransportDataDeref(data); - data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(smlTransportSend(client3, NULL, data, &error), NULL); Modified: trunk/tests/check_libsoup.c ============================================================================== --- trunk/tests/check_libsoup.c Fri Apr 3 15:50:32 2009 (r1028) +++ trunk/tests/check_libsoup.c Fri Apr 3 17:12:26 2009 (r1029) @@ -62,7 +62,7 @@ void transport_dummy_callback(void *message, void *userdata) { /* this function should never be called */ - smlTrace(TRACE_ERROR, "%s", __func__); + smlTrace(TRACE_ERROR, "%s(%p, %p)", __func__, message, userdata); g_atomic_int_inc(&server_errors); } @@ -81,7 +81,7 @@ gpointer data) #endif { - smlTrace(TRACE_ENTRY, "%s(%p)", __func__, msg); + smlTrace(TRACE_ENTRY, "%s(%p, %p, %s, %p, %p, %p)", __func__, server, msg, path, query, client, data); smlAssert(msg); #ifdef HAVE_LIBSOUP22 const char *content = msg->request.body; @@ -122,7 +122,7 @@ gpointer userdata) #endif { - smlTrace(TRACE_ENTRY, "%s(%p)", __func__, msg); + smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, msg, userdata); g_atomic_int_inc(&client_messages); smlTrace(TRACE_EXIT, "%s", __func__); } @@ -209,7 +209,7 @@ SmlBool _recv_event( SmlTransport *tsp, - SmlLink *link, + SmlLink *link_, SmlTransportEventType type, SmlTransportData *data, SmlError *error, @@ -240,8 +240,8 @@ sml_fail_unless(data->type == SML_MIMETYPE_XML, NULL); g_atomic_int_inc(&client_messages); } else { - if (link) { - server_link = link; + if (link_) { + server_link = link_; smlLinkRef(server_link); } @@ -250,9 +250,8 @@ sml_fail_unless(data->type == SML_MIMETYPE_XML, NULL); g_atomic_int_inc(&server_messages); - SmlTransportData *data; data = smlTransportDataNew( - "answer", 6, + (char *)"answer", 6, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); @@ -294,7 +293,7 @@ /* send test message */ - SmlTransportData *data = smlTransportDataNew("test", 4, SML_MIMETYPE_XML, FALSE, &error); + SmlTransportData *data = smlTransportDataNew((char *)"test", 4, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, NULL); @@ -342,7 +341,7 @@ SmlBool init_soup_session(gpointer data, SmlError **error) { - smlTrace(TRACE_ENTRY, "%s", __func__); + smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, data, error); sml_fail_unless(data != NULL, NULL); SoupMessage *msg = data; client_session = soup_session_async_new_with_options( @@ -356,7 +355,7 @@ SmlBool cleanup_soup_session(gpointer data, SmlError **error) { - smlTrace(TRACE_ENTRY, "%s", __func__); + smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, data, error); smlTrace(TRACE_INTERNAL, "%s: aborting session", __func__); soup_session_abort(client_session); @@ -448,7 +447,6 @@ { smlTrace(TRACE_ENTRY, "%s", __func__); init_testbed(); - SmlError *error = NULL; init_server(13002); run_transport_client("http://127.0.0.1:13002"); @@ -465,11 +463,11 @@ /* init server transport */ - SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); - sml_fail_unless(server != NULL, "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportSetConfigOption(server, "PORT", "13003", &error), NULL); - smlTransportSetEventCallback(server, _recv_event, GINT_TO_POINTER(2)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); + SmlTransport *serverTsp = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); + sml_fail_unless(serverTsp != NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportSetConfigOption(serverTsp, "PORT", "13003", &error), NULL); + smlTransportSetEventCallback(serverTsp, _recv_event, GINT_TO_POINTER(2)); + sml_fail_unless(smlTransportInitialize(serverTsp, &error), "%s", smlErrorPrint(&error)); /* client stuff */ @@ -477,7 +475,7 @@ /* cleanup server transport */ - sml_fail_unless(smlTransportDisconnect(server, server_link, &error), NULL); + sml_fail_unless(smlTransportDisconnect(serverTsp, server_link, &error), NULL); smlLinkDeref(server_link); int64_t sleep_max = 5000000000LL; int64_t sleep_interval = 50000000; @@ -489,8 +487,8 @@ } sml_fail_unless(server_errors == 0, NULL); sml_fail_unless(sleep_total < sleep_max, "server disconnect timed out"); - sml_fail_unless(smlTransportFinalize(server, &error), NULL); - smlTransportFree(server); + sml_fail_unless(smlTransportFinalize(serverTsp, &error), NULL); + smlTransportFree(serverTsp); } END_TEST Modified: trunk/tests/check_manager.c ============================================================================== --- trunk/tests/check_manager.c Fri Apr 3 15:50:32 2009 (r1028) +++ trunk/tests/check_manager.c Fri Apr 3 17:12:26 2009 (r1029) @@ -202,8 +202,8 @@ sml_fail_unless(smlManagerStart(servermanager, &error), NULL); sml_fail_unless(error == NULL, NULL); - char *datastr = "<SyncML></SyncML>"; - SmlTransportData *data = smlTransportDataNew(datastr, strlen(datastr), SML_MIMETYPE_XML, FALSE, &error); + const char *datastr = "<SyncML></SyncML>"; + SmlTransportData *data = smlTransportDataNew((char *)datastr, strlen(datastr), SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, NULL); @@ -278,8 +278,8 @@ sml_fail_unless(smlManagerStart(servermanager, &error), NULL); sml_fail_unless(error == NULL, NULL); - char *datastr = "<SyncML><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>test</LocURI></Target><Source><LocURI>test</LocURI></Source></SyncHdr><SyncBody><Alert><CmdID>1</CmdID><Item><Target><LocURI>/test</LocURI></Target><Source><LocURI>/test</LocURI></Source><Meta><Anchor xmlns=\"syncml:metinf\"><Next>Next</Next><Last>last</Last></Anchor></Meta></Item><Data>200</Data></Alert><Final></Final></SyncBody></SyncML>"; - SmlTransportData *data = smlTransportDataNew(datastr, strlen(datastr), SML_MIMETYPE_XML, FALSE, &error); + const char *datastr = "<SyncML><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>test</LocURI></Target><Source><LocURI>test</LocURI></Source></SyncHdr><SyncBody><Alert><CmdID>1</CmdID><Item><Target><LocURI>/test</LocURI></Target><Source><LocURI>/test</LocURI></Source><Meta><Anchor xmlns=\"syncml:metinf\"><Next>Next</Next><Last>last</Last></Anchor></Meta></Item><Data>200</Data></Alert><Final></Final></SyncBody></SyncML>"; + SmlTransportData *data = smlTransportDataNew((char *)datastr, strlen(datastr), SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, NULL); @@ -363,8 +363,8 @@ /* the client send its data to the server */ - char *datastr = "<SyncML><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>test</LocURI></Target><Source><LocURI>test</LocURI></Source></SyncHdr><SyncBody><Alert><CmdID>1</CmdID><Item><Target><LocURI>/test</LocURI></Target><Source><LocURI>/test</LocURI></Source><Meta><Anchor xmlns=\"syncml:metinf\"><Next>test1</Next><Last>test2</Last></Anchor></Meta></Item><Data>200</Data></Alert><Final></Final></SyncBody></SyncML>"; - SmlTransportData *data = smlTransportDataNew(datastr, strlen(datastr), SML_MIMETYPE_XML, FALSE, &error); + const char *datastr = "<SyncML><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>test</LocURI></Target><Source><LocURI>test</LocURI></Source></SyncHdr><SyncBody><Alert><CmdID>1</CmdID><Item><Target><LocURI>/test</LocURI></Target><Source><LocURI>/test</LocURI></Source><Meta><Anchor xmlns=\"syncml:metinf\"><Next>test1</Next><Last>test2</Last></Anchor></Meta></Item><Data>200</Data></Alert><Final></Final></SyncBody></SyncML>"; + SmlTransportData *data = smlTransportDataNew((char *)datastr, strlen(datastr), SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, NULL); Modified: trunk/tests/check_md5.c ============================================================================== --- trunk/tests/check_md5.c Fri Apr 3 15:50:32 2009 (r1028) +++ trunk/tests/check_md5.c Fri Apr 3 17:12:26 2009 (r1029) @@ -23,7 +23,7 @@ START_TEST (check_md5_1) { - char *data = ""; + const char *data = ""; unsigned char digest[16]; SmlError *error = NULL; @@ -37,7 +37,7 @@ START_TEST (check_md5_2) { - char *data = "a"; + const char *data = "a"; unsigned char digest[16]; SmlError *error = NULL; @@ -51,7 +51,7 @@ START_TEST (check_md5_3) { - char *data = "abc"; + const char *data = "abc"; unsigned char digest[16]; SmlError *error = NULL; @@ -65,7 +65,7 @@ START_TEST (check_md5_4) { - char *data = "message digest"; + const char *data = "message digest"; unsigned char digest[16]; SmlError *error = NULL; @@ -79,7 +79,7 @@ START_TEST (check_md5_5) { - char *data = "abcdefghijklmnopqrstuvwxyz"; + const char *data = "abcdefghijklmnopqrstuvwxyz"; unsigned char digest[16]; SmlError *error = NULL; @@ -93,7 +93,7 @@ START_TEST (check_md5_6) { - char *data = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + const char *data = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; unsigned char digest[16]; SmlError *error = NULL; @@ -107,7 +107,7 @@ START_TEST (check_md5_7) { - char *data = "12345678901234567890123456789012345678901234567890123456789012345678901234567890"; + const char *data = "12345678901234567890123456789012345678901234567890123456789012345678901234567890"; unsigned char digest[16]; SmlError *error = NULL; Modified: trunk/tests/check_obex.c ============================================================================== --- trunk/tests/check_obex.c Fri Apr 3 15:50:32 2009 (r1028) +++ trunk/tests/check_obex.c Fri Apr 3 17:12:26 2009 (r1029) @@ -104,9 +104,9 @@ int client_receives = 0; int client_errors = 0; -SmlBool _recv_client_event(SmlTransport *tsp, SmlLink *link, SmlTransportEventType type, SmlTransportData *data, SmlError *error, void *userdata) +SmlBool _recv_client_event(SmlTransport *tsp, SmlLink *link_, SmlTransportEventType type, SmlTransportData *data, SmlError *error, void *userdata) { - smlTrace(TRACE_ENTRY, "%s(%d)", __func__, type); + smlTrace(TRACE_ENTRY, "%s(%p, %p, %d)", __func__, tsp, link_, type); sml_fail_unless(GPOINTER_TO_INT(userdata) == 1, NULL); @@ -140,7 +140,7 @@ int server_disconnect_done = 0; int server_receives = 0; -SmlBool _recv_server_event(SmlTransport *tsp, SmlLink *link, SmlTransportEventType type, SmlTransportData *data, SmlError *error, void *userdata) +SmlBool _recv_server_event(SmlTransport *tsp, SmlLink *link_, SmlTransportEventType type, SmlTransportData *data, SmlError *error, void *userdata) { smlTrace(TRACE_ENTRY, "%s(%d, %p)", __func__, type, error); @@ -151,34 +151,34 @@ if (!strcmp(data->data, "test")) { sml_fail_unless(data->size == 5, NULL); sml_fail_unless(data->type == SML_MIMETYPE_XML, NULL); - sml_fail_unless(link != NULL, NULL); + sml_fail_unless(link_ != NULL, NULL); if (GPOINTER_TO_INT(userdata) == 1) { - data = smlTransportDataNew("answer", 7, SML_MIMETYPE_XML, FALSE, &error); + data = smlTransportDataNew((char *)"answer", 7, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportSend(tsp, link, data, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportSend(tsp, link_, data, &error), "%s", smlErrorPrint(&error)); smlTransportDataDeref(data); } else if (GPOINTER_TO_INT(userdata) == 2) { SmlError *newerror = NULL; smlErrorSet(&newerror, SML_ERROR_GENERIC, "test"); - smlTransportSetError(tsp, link, &newerror); + smlTransportSetError(tsp, link_, &newerror); smlErrorDeref(&newerror); } else if (GPOINTER_TO_INT(userdata) == 3) { - sml_fail_unless(smlTransportDisconnect(tsp, link, &error), NULL); + sml_fail_unless(smlTransportDisconnect(tsp, link_, &error), NULL); } else { sml_fail_unless(FALSE, "The userdata %d was not expected.", GPOINTER_TO_INT(userdata)); } } else if (!strcmp(data->data, "error")) { sml_fail_unless(data->size == 6, NULL); sml_fail_unless(data->type == SML_MIMETYPE_XML, NULL); - sml_fail_unless(link != NULL, NULL); + sml_fail_unless(link_ != NULL, NULL); SmlError *newerror = NULL; smlErrorSet(&newerror, SML_ERROR_GENERIC, "test2"); - smlTransportSetError(tsp, link, &newerror); + smlTransportSetError(tsp, link_, &newerror); smlErrorDeref(&newerror); } else { sml_fail_unless(FALSE, "The received data was not expected (%s).", data->data); @@ -324,7 +324,7 @@ while (client_connect_done < 1 || server_connect_done < 1) { usleep(50); }; - SmlTransportData *data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); @@ -402,7 +402,7 @@ while (client_connect_done < 1 || server_connect_done < 1) { usleep(50); }; - SmlTransportData *data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); @@ -465,7 +465,7 @@ int i; for (i = 0; i < num; i++) { - data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); @@ -545,21 +545,21 @@ while (client_connect_done < 3 || server_connect_done < 3) { usleep(50); }; - SmlTransportData *data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", smlErrorPrint(&error)); sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); smlTransportDataDeref(data); - data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); sml_fail_unless(smlTransportSend(client2, NULL, data, &error), "%s", smlErrorPrint(&error)); sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); smlTransportDataDeref(data); - data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); sml_fail_unless(smlTransportSend(client3, NULL, data, &error), "%s", smlErrorPrint(&error)); @@ -647,21 +647,21 @@ int i; for (i = 0; i < num; i++) { - data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", smlErrorPrint(&error)); sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); smlTransportDataDeref(data); - data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); sml_fail_unless(smlTransportSend(client2, NULL, data, &error), "%s", smlErrorPrint(&error)); sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); smlTransportDataDeref(data); - data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); sml_fail_unless(smlTransportSend(client3, NULL, data, &error), "%s", smlErrorPrint(&error)); @@ -835,21 +835,21 @@ while (client_connect_done < 3 || server_connect_done < 3) { usleep(50); }; - SmlTransportData *data = smlTransportDataNew("test", 5, SML_MIMETYPE_XML, FALSE, &error); + SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", smlErrorPrint(&error)); sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); smlTransportDataDeref(data); - data = smlTransportDataNew("error", 6, SML_MIMETYPE_XML, FALSE, &error); + data = smlTransportDataNew((char *)"error", 6, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); sml_fail_unless(smlTransportSend(client2, NULL, data, &error), "%s", smlErrorPrint(&error)); sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); smlTransportDataDeref(data); - data = smlTransportDataNew("error", 6, SML_MIMETYPE_XML, FALSE, &error); + data = smlTransportDataNew((char *)"error", 6, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); sml_fail_unless(error == NULL, "%s", smlErrorPrint(&error)); sml_fail_unless(smlTransportSend(client3, NULL, data, &error), "%s", smlErrorPrint(&error)); Modified: trunk/tests/check_session.c ============================================================================== --- trunk/tests/check_session.c Fri Apr 3 15:50:32 2009 (r1028) +++ trunk/tests/check_session.c Fri Apr 3 17:12:26 2009 (r1029) @@ -109,6 +109,7 @@ gboolean _session_prepare(GSource *source, gint *timeout_) { + smlTrace(TRACE_INTERNAL, "%s(%p, %p)", __func__, source, timeout_); *timeout_ = 1; return FALSE; } @@ -121,6 +122,7 @@ gboolean _session_dispatch(GSource *source, GSourceFunc callback, gpointer user_data) { + smlTrace(TRACE_INTERNAL, "%s(%p, %p, %p)", __func__, source, callback, user_data); SmlSession *session = user_data; while (smlSessionCheck(session)) @@ -130,6 +132,7 @@ } gboolean _data_prepare(GSource *source, gint *timeout_) { + smlTrace(TRACE_INTERNAL, "%s(%p, %p)", __func__, source, timeout_); *timeout_ = 1; return FALSE; } @@ -148,6 +151,7 @@ gboolean _data_dispatch(GSource *source, GSourceFunc callback, gpointer user_data) { + smlTrace(TRACE_INTERNAL, "%s(%p. %p, %p)", __func__, source, callback, user_data); SmlSessionThread *check = user_data; SmlError *error = NULL; smlAssert(check != NULL); @@ -285,9 +289,6 @@ SmlManager* _start_manager() { - unsigned int defaultMaxMsgSize = 10240; - unsigned int defaultMaxObjSize = 1024000; - SmlError *error = NULL; _tsp = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); sml_fail_unless(_tsp != NULL, "%s", smlErrorPrint(&error)); @@ -360,7 +361,7 @@ static void _event_callback(SmlSession *session, SmlSessionEventType type, SmlCommand *command, SmlCommand *parent, SmlStatus *reply, SmlError *error, void *userdata) { - smlTrace(TRACE_ENTRY, "%s - %d", __func__, type); + smlTrace(TRACE_ENTRY, "%s: %d (%p)", __func__, type, parent); smlAssert(GPOINTER_TO_INT(userdata) <= 5); SmlError *locerror = NULL; @@ -617,7 +618,7 @@ sml_fail_unless(loc != NULL, NULL); sml_fail_unless(error == NULL, NULL); - char *input = "<SyncML xmlns=\"SYNCML:SYNCML1.2\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.2</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/test</LocURI></Target><Source><LocURI>/test</LocURI></Source></SyncHdr><SyncBody><Alert><CmdID>1</CmdID><Item><Target><LocURI>/test</LocURI></Target><Source><LocURI>/test</LocURI></Source><Meta><Anchor xmlns=\"syncml:metinf\"><Next>last</Next><Last>next</Last></Anchor></Meta></Item><Data>200</Data></Alert><Final></Final></SyncBody></SyncML>"; + const char *input = "<SyncML xmlns=\"SYNCML:SYNCML1.2\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.2</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/test</LocURI></Target><Source><LocURI>/test</LocURI></Source></SyncHdr><SyncBody><Alert><CmdID>1</CmdID><Item><Target><LocURI>/test</LocURI></Target><Source><LocURI>/test</LocURI></Source><Meta><Anchor xmlns=\"syncml:metinf\"><Next>last</Next><Last>next</Last></Anchor></Meta></Item><Data>200</Data></Alert><Final></Final></SyncBody></SyncML>"; SmlParser *parser = smlParserNew(SML_MIMETYPE_XML, 0, &error); sml_fail_unless(parser != NULL, NULL); @@ -1382,7 +1383,7 @@ sml_fail_unless(loc != NULL, NULL); sml_fail_unless(error == NULL, NULL); - char *input = "<SyncML xmlns=\"SYNCML:SYNCML1.1\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><NumberOfChanges>1</NumberOfChanges><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type><Size>8</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData></MoreData></Item></Add></Sync></SyncBody></SyncML>"; + const char *input = "<SyncML xmlns=\"SYNCML:SYNCML1.1\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><NumberOfChanges>1</NumberOfChanges><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type><Size>8</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData></MoreData></Item></Add></Sync></SyncBody></SyncML>"; SmlParser *parser = smlParserNew(SML_MIMETYPE_XML, 0, &error); sml_fail_unless(parser != NULL, NULL); @@ -1423,7 +1424,7 @@ smlTransportDataDeref(to_session2); to_session2 = NULL; - char *input2 = "<SyncML xmlns=\"SYNCML:SYNCML1.1\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>2</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data></Item></Add></Sync><Final></Final></SyncBody></SyncML>"; + const char *input2 = "<SyncML xmlns=\"SYNCML:SYNCML1.1\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>2</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data></Item></Add></Sync><Final></Final></SyncBody></SyncML>"; parser = smlParserNew(SML_MIMETYPE_XML, 0, &error); sml_fail_unless(parser != NULL, NULL); @@ -1464,7 +1465,7 @@ sml_fail_unless(loc != NULL, NULL); sml_fail_unless(error == NULL, NULL); - char *input = "<SyncML xmlns=\"SYNCML:SYNCML1.1\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><NumberOfChanges>1</NumberOfChanges><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type><Size>20</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData></MoreData></Item></Add></Sync></SyncBody></SyncML>"; + const char *input = "<SyncML xmlns=\"SYNCML:SYNCML1.1\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><NumberOfChanges>1</NumberOfChanges><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type><Size>20</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData></MoreData></Item></Add></Sync></SyncBody></SyncML>"; SmlParser *parser = smlParserNew(SML_MIMETYPE_XML, 0, &error); sml_fail_unless(parser != NULL, NULL); @@ -1503,7 +1504,7 @@ smlTransportDataDeref(to_session2); to_session2 = NULL; - char *input2 = "<SyncML xmlns=\"SYNCML:SYNCML1.1\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>2</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData/></Item></Add></Sync></SyncBody></SyncML>"; + const char *input2 = "<SyncML xmlns=\"SYNCML:SYNCML1.1\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>2</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData/></Item></Add></Sync></SyncBody></SyncML>"; parser = smlParserNew(SML_MIMETYPE_XML, 0, &error); sml_fail_unless(parser != NULL, NULL); @@ -1655,7 +1656,7 @@ sml_fail_unless(loc != NULL, NULL); sml_fail_unless(error == NULL, NULL); - char *input = "<SyncML xmlns=\"SYNCML:SYNCML1.1\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><NumberOfChanges>1</NumberOfChanges><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type><Size>8</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData></MoreData></Item></Add><Add><CmdID>3</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data></Item></Add></Sync></SyncBody></SyncML>"; + const char *input = "<SyncML xmlns=\"SYNCML:SYNCML1.1\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><NumberOfChanges>1</NumberOfChanges><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type><Size>8</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData></MoreData></Item></Add><Add><CmdID>3</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data></Item></Add></Sync></SyncBody></SyncML>"; SmlParser *parser = smlParserNew(SML_MIMETYPE_XML, 0, &error); sml_fail_unless(parser != NULL, NULL); @@ -1704,7 +1705,7 @@ sml_fail_unless(loc != NULL, NULL); sml_fail_unless(error == NULL, NULL); - char *input = "<SyncML xmlns=\"SYNCML:SYNCML1.0\"><SyncHdr><VerProto>SyncML/1.0</VerProto><VerDTD>1.0</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><NumberOfChanges>1</NumberOfChanges><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type><Size>8</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData></MoreData></Item></Add></Sync></SyncBody></SyncML>"; + const char *input = "<SyncML xmlns=\"SYNCML:SYNCML1.0\"><SyncHdr><VerProto>SyncML/1.0</VerProto><VerDTD>1.0</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><NumberOfChanges>1</NumberOfChanges><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type><Size>8</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData></MoreData></Item></Add></Sync></SyncBody></SyncML>"; SmlParser *parser = smlParserNew(SML_MIMETYPE_XML, 0, &error); sml_fail_unless(parser != NULL, NULL); @@ -1800,7 +1801,7 @@ sml_fail_unless(loc != NULL, NULL); sml_fail_unless(error == NULL, NULL); - char *input = "<SyncML xmlns=\"SYNCML:SYNCML1.1\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><NumberOfChanges>1</NumberOfChanges><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type><Size>8</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData></MoreData></Item></Add></Sync><Final/></SyncBody></SyncML>"; + const char *input = "<SyncML xmlns=\"SYNCML:SYNCML1.1\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><NumberOfChanges>1</NumberOfChanges><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type><Size>8</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData></MoreData></Item></Add></Sync><Final/></SyncBody></SyncML>"; SmlParser *parser = smlParserNew(SML_MIMETYPE_XML, 0, &error); sml_fail_unless(parser != NULL, NULL); @@ -1860,7 +1861,7 @@ sml_fail_unless(loc != NULL, NULL); sml_fail_unless(error == NULL, NULL); - char *input = "<SyncML xmlns=\"SYNCML:SYNCML1.1\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><NumberOfChanges>1</NumberOfChanges><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData></MoreData></Item></Add></Sync></SyncBody></SyncML>"; + const char *input = "<SyncML xmlns=\"SYNCML:SYNCML1.1\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><NumberOfChanges>1</NumberOfChanges><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData></MoreData></Item></Add></Sync></SyncBody></SyncML>"; SmlParser *parser = smlParserNew(SML_MIMETYPE_XML, 0, &error); sml_fail_unless(parser != NULL, NULL); @@ -1914,7 +1915,7 @@ sml_fail_unless(loc != NULL, NULL); sml_fail_unless(error == NULL, NULL); - char *input = "<SyncML xmlns=\"SYNCML:SYNCML1.1\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><NumberOfChanges>1</NumberOfChanges><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type><Size>8</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData></MoreData></Item></Add></Sync></SyncBody></SyncML>"; + const char *input = "<SyncML xmlns=\"SYNCML:SYNCML1.1\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><NumberOfChanges>1</NumberOfChanges><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type><Size>8</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData></MoreData></Item></Add></Sync></SyncBody></SyncML>"; SmlParser *parser = smlParserNew(SML_MIMETYPE_XML, 0, &error); sml_fail_unless(parser != NULL, NULL); @@ -1955,7 +1956,7 @@ smlTransportDataDeref(to_session2); to_session2 = NULL; - char *input2 = "<SyncML xmlns=\"SYNCML:SYNCML1.1\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>2</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type><Size>8</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data></Item></Add></Sync><Final></Final></SyncBody></SyncML>"; + const char *input2 = "<SyncML xmlns=\"SYNCML:SYNCML1.1\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>2</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type><Size>8</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data></Item></Add></Sync><Final></Final></SyncBody></SyncML>"; parser = smlParserNew(SML_MIMETYPE_XML, 0, &error); sml_fail_unless(parser != NULL, NULL); @@ -1998,7 +1999,7 @@ sml_fail_unless(loc != NULL, NULL); sml_fail_unless(error == NULL, NULL); - char *input = "<SyncML xmlns=\"SYNCML:SYNCML1.1\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>1</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><NumberOfChanges>1</NumberOfChanges><Add><CmdID>2</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type><Size>9</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData></MoreData></Item></Add></Sync></SyncBody></SyncML>"; + const char *input = "<SyncML xmlns=\"SYNCML:SYNCML1.1\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source>... [truncated message content] |
