Menu
▾
▴
[Opensync-commits] r1180 - trunk/tests
|
From: <svn...@op...> - 2009-07-13 12:14:05
|
Author: bellmich Date: Mon Jul 13 14:13:56 2009 New Revision: 1180 URL: http://libsyncml.opensync.org/changeset/1180 Log: migrated check_xml_parser from SmlError to GError Modified: trunk/tests/check_xml_parser.c Modified: trunk/tests/check_xml_parser.c ============================================================================== --- trunk/tests/check_xml_parser.c Mon Jul 13 14:12:22 2009 (r1179) +++ trunk/tests/check_xml_parser.c Mon Jul 13 14:13:56 2009 (r1180) @@ -24,57 +24,58 @@ #include <libsyncml/parser/sml_xml_parse.h> #include <libsyncml/sml_command_internals.h> #include <libsyncml/sml_elements_internals.h> +#include <libsyncml/sml_error_internals.h> START_TEST (xml_parser_empty) { const char *data = " "; - SmlError *error = NULL; + GError *error = NULL; SmlParser *parser = start_parser(data, &error); sml_fail_unless(parser == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); } END_TEST START_TEST (xml_parser_syncml_empty) { const char *data = "<SyncML></SyncML>"; - SmlError *error = NULL; + GError *error = NULL; SmlParser *parser = start_parser(data, &error); sml_fail_unless(parser == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); } END_TEST START_TEST (xml_parser_syncml_wrong_case) { const char *data = "<SyncMl></SyncMl>"; - SmlError *error = NULL; + GError *error = NULL; SmlParser *parser = start_parser(data, &error); sml_fail_unless(parser == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); } END_TEST START_TEST (xml_parser_syncml_additional) { const char *data = "<SyncML></SyncML><test></test>"; - SmlError *error = NULL; + GError *error = NULL; SmlParser *parser = start_parser(data, &error); sml_fail_unless(parser == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); } END_TEST START_TEST (xml_parser_no_syncbody) { const char *data = "<SyncML><SyncHdr></SyncHdr></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -82,11 +83,11 @@ sml_fail_unless(!smlParserGetHeader(parser, &header, &cred, &error), NULL); sml_fail_unless(header == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(!smlParserEnd(parser, NULL, NULL, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -95,20 +96,20 @@ START_TEST (xml_parser_no_synchdr) { const char *data = "<SyncML><SyncBody></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = NULL; SmlParser *parser = start_parser(data, &error); sml_fail_unless(parser == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); } END_TEST START_TEST (xml_parser_synchdr_empty) { const char *data = "<SyncML><SyncHdr></SyncHdr><SyncBody></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -116,11 +117,11 @@ sml_fail_unless(!smlParserGetHeader(parser, &header, &cred, &error), NULL); sml_fail_unless(header == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(!smlParserEnd(parser, NULL, NULL, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -129,9 +130,9 @@ START_TEST (xml_parser_synchdr_verproto) { const char *data = "<SyncML><SyncHdr><VerProto>SyncML/1.1</VerProto></SyncHdr><SyncBody></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -139,11 +140,11 @@ sml_fail_unless(!smlParserGetHeader(parser, &header, &cred, &error), NULL); sml_fail_unless(header == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(!smlParserEnd(parser, NULL, NULL, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -152,9 +153,9 @@ START_TEST (xml_parser_synchdr_verdtd) { const char *data = "<SyncML><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD></SyncHdr><SyncBody></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -162,11 +163,11 @@ sml_fail_unless(!smlParserGetHeader(parser, &header, &cred, &error), NULL); sml_fail_unless(header == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(!smlParserEnd(parser, NULL, NULL, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -175,9 +176,9 @@ START_TEST (xml_parser_synchdr_msgid) { const char *data = "<SyncML><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID></SyncHdr><SyncBody></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -185,11 +186,11 @@ sml_fail_unless(!smlParserGetHeader(parser, &header, &cred, &error), NULL); sml_fail_unless(header == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(!smlParserEnd(parser, NULL, NULL, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -198,9 +199,9 @@ START_TEST (xml_parser_synchdr_sessionid) { const char *data = "<SyncML><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID></SyncHdr><SyncBody></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -208,11 +209,11 @@ sml_fail_unless(!smlParserGetHeader(parser, &header, &cred, &error), NULL); sml_fail_unless(header == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(!smlParserEnd(parser, NULL, NULL, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -221,9 +222,9 @@ START_TEST (xml_parser_synchdr_target) { const char *data = "<SyncML><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>test</LocURI></Target></SyncHdr><SyncBody></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -231,11 +232,11 @@ sml_fail_unless(!smlParserGetHeader(parser, &header, &cred, &error), NULL); sml_fail_unless(header == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(!smlParserEnd(parser, NULL, NULL, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -244,9 +245,9 @@ START_TEST (xml_parser_synchdr_source) { const char *data = "<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></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -261,7 +262,7 @@ sml_fail_unless(header->source != NULL, NULL); sml_fail_unless(header->protocol == SML_PROTOCOL_SYNCML, NULL); sml_fail_unless(header->version == SML_VERSION_11, NULL); - sml_fail_unless(!strcmp(header->sessionID, "1"), NULL); + sml_fail_unless(header->sessionID == 1, NULL); smlHeaderFree(header); SmlStatus *status = NULL; @@ -283,10 +284,10 @@ START_TEST (xml_parser_synchdr_source2) { - const char *data = "<SyncML><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>asd</SessionID><Target><LocURI>test</LocURI></Target><Source><LocURI>test</LocURI></Source></SyncHdr><SyncBody></SyncBody></SyncML>"; - SmlError *error = NULL; + const char *data = "<SyncML><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>123</SessionID><Target><LocURI>test</LocURI></Target><Source><LocURI>test</LocURI></Source></SyncHdr><SyncBody></SyncBody></SyncML>"; + GError *error = 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; @@ -301,7 +302,7 @@ sml_fail_unless(header->source != NULL, NULL); sml_fail_unless(header->protocol == SML_PROTOCOL_SYNCML, NULL); sml_fail_unless(header->version == SML_VERSION_11, NULL); - sml_fail_unless(!strcmp(header->sessionID, "asd"), NULL); + sml_fail_unless(header->sessionID == 123, NULL); smlHeaderFree(header); SmlStatus *status = NULL; @@ -324,9 +325,9 @@ START_TEST (xml_parser_synchdr_additional) { const char *data = "<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><test></test></SyncHdr><SyncBody></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -334,11 +335,11 @@ sml_fail_unless(!smlParserGetHeader(parser, &header, &cred, &error), NULL); sml_fail_unless(header == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(!smlParserEnd(parser, NULL, NULL, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -347,9 +348,9 @@ START_TEST (xml_parser_status_empty) { const char *data = "<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><Status></Status></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -366,7 +367,7 @@ sml_fail_unless(!smlParserGetStatus(parser, &status, &error), NULL); sml_fail_unless(status == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); SmlCommand *cmd = NULL; sml_fail_unless(smlParserGetCommand(parser, &cmd, &error), NULL); @@ -383,9 +384,9 @@ START_TEST (xml_parser_status_cmdid) { const char *data = "<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><Status><CmdID>1</CmdID></Status></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -402,7 +403,7 @@ sml_fail_unless(!smlParserGetStatus(parser, &status, &error), NULL); sml_fail_unless(status == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -411,9 +412,9 @@ START_TEST (xml_parser_status_msgref) { const char *data = "<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><Status><CmdID>1</CmdID><MsgRef>1</MsgRef></Status></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -430,7 +431,7 @@ sml_fail_unless(!smlParserGetStatus(parser, &status, &error), NULL); sml_fail_unless(status == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -439,9 +440,9 @@ START_TEST (xml_parser_status_cmdref) { const char *data = "<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><Status><CmdID>1</CmdID><MsgRef>1</MsgRef><CmdRef>1</CmdRef></Status></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -458,7 +459,7 @@ sml_fail_unless(!smlParserGetStatus(parser, &status, &error), NULL); sml_fail_unless(status == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -467,9 +468,9 @@ START_TEST (xml_parser_status) { const char *data = "<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><Status><CmdID>1</CmdID><MsgRef>1</MsgRef><CmdRef>0</CmdRef><Cmd>Sync</Cmd></Status></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -507,9 +508,9 @@ START_TEST (xml_parser_status2) { const char *data = "<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><Status><CmdID>1</CmdID><MsgRef>1</MsgRef><CmdRef>0</CmdRef><Cmd>Sync</Cmd></Status><Status><CmdID>1</CmdID><MsgRef>1</MsgRef><CmdRef>0</CmdRef><Cmd>Sync</Cmd></Status></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -542,8 +543,8 @@ sml_fail_unless(cmd == 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); @@ -556,9 +557,9 @@ START_TEST (xml_parser_status3) { const char *data = "<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><Status><CmdID>1</CmdID><MsgRef>1</MsgRef><CmdRef>0</CmdRef><Cmd>Sync</Cmd></Status><Status><CmdID>1</CmdID><MsgRef>1</MsgRef><CmdRef>0</CmdRef><Cmd>Sync</Cmd></Status><Final/></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -591,8 +592,8 @@ sml_fail_unless(cmd == NULL, NULL); sml_fail_unless(error == NULL, NULL); - SmlBool final = FALSE; - SmlBool end = FALSE; + gboolean final = FALSE; + gboolean end = FALSE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == TRUE, NULL); @@ -605,9 +606,9 @@ START_TEST (xml_parser_status_google) { const char *data = "<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><Status><CmdID>5</CmdID><MsgRef>2</MsgRef><CmdRef>3</CmdRef><Cmd>Alert</Cmd><SourceRef>contacts</SourceRef><TargetRef>contacts</TargetRef><Data>200</Data><Item><Data><![CDATA[20090417T092559Z]]></Data></Item></Status></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -645,9 +646,9 @@ START_TEST (xml_parser_final) { const char *data = "<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><Status><CmdID>1</CmdID><MsgRef>1</MsgRef><CmdRef>0</CmdRef><Cmd>Sync</Cmd></Status><Status><CmdID>1</CmdID><MsgRef>1</MsgRef><CmdRef>0</CmdRef><Cmd>Sync</Cmd></Status><Final></Final></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -680,8 +681,8 @@ sml_fail_unless(cmd == NULL, NULL); sml_fail_unless(error == NULL, NULL); - SmlBool final = FALSE; - SmlBool end = FALSE; + gboolean final = FALSE; + gboolean end = FALSE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == TRUE, NULL); @@ -694,9 +695,9 @@ START_TEST (xml_parser_final2) { const char *data = "<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><Status><CmdID>1</CmdID><MsgRef>1</MsgRef><CmdRef>0</CmdRef><Cmd>Sync</Cmd></Status><Status><CmdID>1</CmdID><MsgRef>1</MsgRef><CmdRef>0</CmdRef><Cmd>Sync</Cmd></Status><Final/></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -729,8 +730,8 @@ sml_fail_unless(cmd == NULL, NULL); sml_fail_unless(error == NULL, NULL); - SmlBool final = FALSE; - SmlBool end = FALSE; + gboolean final = FALSE; + gboolean end = FALSE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == TRUE, NULL); @@ -743,9 +744,9 @@ START_TEST (xml_parser_cmd) { const char *data = "<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></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -768,7 +769,7 @@ sml_fail_unless(error == NULL, NULL); SmlCommand *cmd = NULL; - sml_fail_unless(smlParserGetCommand(parser, &cmd, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlParserGetCommand(parser, &cmd, &error), "%s", error->message); sml_fail_unless(cmd != NULL, NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(cmd->cmdID == 1, NULL); @@ -778,8 +779,8 @@ sml_fail_unless(cmd == 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); @@ -792,9 +793,9 @@ START_TEST (xml_parser_cmd_final) { const char *data = "<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>"; - SmlError *error = NULL; + GError *error = 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; @@ -827,8 +828,8 @@ sml_fail_unless(cmd == NULL, NULL); sml_fail_unless(error == NULL, NULL); - SmlBool final = FALSE; - SmlBool end = TRUE; + gboolean final = FALSE; + gboolean end = TRUE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == TRUE, NULL); @@ -841,9 +842,9 @@ START_TEST (xml_parser_sync_subcommand) { const char *data = "<SyncML xmlns=\"SYNCML:SYNCML1.2\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.2</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>3</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><NumberOfChanges>1</NumberOfChanges><Add><CmdID>4</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>"; - SmlError *error = NULL; + GError *error = 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; @@ -887,8 +888,8 @@ sml_fail_unless(cmd == NULL, NULL); sml_fail_unless(error == NULL, NULL); - SmlBool final = FALSE; - SmlBool end = TRUE; + gboolean final = FALSE; + gboolean end = TRUE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == TRUE, NULL); @@ -903,9 +904,9 @@ { const char *data = "<?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>1</SessionID><MsgID>1</MsgID><Target><LocURI>opium</LocURI></Target><Source><LocURI>IMEI:xxxxxxxxxxxxxxx</LocURI></Source><Meta><MaxMsgSize xmlns=\"syncml:metinf\">10000</MaxMsgSize><EMI xmlns=\"syncml:metinf\">NokiaInq/1.1</EMI></Meta></SyncHdr><SyncBody><Status><CmdID>1</CmdID><Cmd>SyncHdr</Cmd><Data>403</Data></Status><Status><CmdID>2</CmdID><CmdRef>1</CmdRef><Cmd>Alert</Cmd><Data>500</Data></Status><Status><CmdID>3</CmdID><CmdRef>2</CmdRef><Cmd>Alert</Cmd><Data>500</Data></Status><Status><CmdID>4</CmdID><CmdRef>3</CmdRef><Cmd>Alert</Cmd><Data>500</Data></Status><Final/></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -927,9 +928,9 @@ { const char *data = "<?xml version=\"1.0\"?>\n<!DOCTYPE SyncML PUBLIC \"-//SYNCML//DTD SyncML 1.1//EN\" \"http://www.syncml.org/docs/syncml_represent_v11_20020213.dtd\">\n<SyncML xmlns=\"syncml:SYNCML1.1\">\n<SyncHdr>\n<VerDTD>\n1.1\n</VerDTD>\n<VerProto>\nSyncML/1.1\n</VerProto>\n<SessionID>\n1125161435\n</SessionID>\n<MsgID>\n1\n</MsgID>\n<Target>\n<LocURI>\nhttp://test.com:7962/\n</LocURI>\n</Target>\n<Source>\n<LocURI>\n35686843434\n</LocURI>\n<LocName>\nasd\n</LocName>\n</Source>\n<Cred>\n<Meta>\n<Format xmlns=\"syncml:metinf\">\nb64\n</Format>\n<Type xmlns=\"syncml:metinf\">\nsyncml:auth-basic\n</Type>\n</Meta>\n<Data>\nYXNkOmFzZA==\n</Data>\n</Cred>\n<Meta>\n<MaxMsgSize xmlns=\"syncml:metinf\">\n3300\n</MaxMsgSize>\n</Meta>\n</SyncHdr>\n<SyncBody>\n<Alert>\n<CmdID>\n1\n</CmdID>\n<Data>\n201\n</Data>\n<Item>\n<Target>\n<LocURI>\npeople\n</LocURI>\n</Target>\n<Source>\n<LocURI>\npeople\n</LocURI>\n</Source>\n<Meta>\n<Anchor xmlns=\"syncml:metinf\">\n<Last>\n</Last>\n<Next>\n1\n</Next>\n</Anchor>\n</Meta>\n</Item>\n</Alert>\n<Put>\n<CmdID>\n2\n</CmdID>\n<Meta>\n<Format xmlns=\"syncml:metinf\">\nwbxml\n</Format>\n<Type xmlns=\"syncml:metinf\">\napplication/vnd.syncml-devinf+xml\n</Type>\n</Meta>\n<Item>\n<Source>\n<LocURI>\n./devinf11\n</LocURI>\n</Source>\n<Data>\n<DevInf xmlns=\"syncml:devinf\">\n<VerDTD>\n1.1\n</VerDTD>\n<Man>\nMotorola CE, Copyright 2004\n</Man>\n<Mod>\nV3\n</Mod>\n<SwV>\nR374_G_0E.41.C3R_A\n</SwV>\n<HwV>\nSJUG0851CA\n</HwV>\n<DevID>\n3564564556453\n</DevID>\n<DevTyp>\nphone\n</DevTyp>\n<DataStore>\n<SourceRef>\npeople\n</SourceRef>\n<Rx-Pref>\n<CTType>\ntext/x-vcard\n</CTType>\n<VerCT>\n2.1\n</VerCT>\n</Rx-Pref>\n<Tx-Pref>\n<CTType>\ntext/x-vcard\n</CTType>\n<VerCT>\n2.1\n</VerCT>\n</Tx-Pref>\n<SyncCap>\n<SyncType>\n1\n</SyncType>\n<SyncType>\n2\n</SyncType>\n</SyncCap>\n</DataStore>\n<CTCap>\n<CTType>\ntext/x-vcard\n</CTType>\n<PropName>\nBEGIN\n</PropName>\n<ValEnum>\nVCARD\n</ValEnum>\n<PropName>\nEND\n</PropName>\n<ValEnum>\nVCARD\n</ValEnum>\n<PropName>\nVERSION\n</PropName>\n<ValEnum>\n2.1\n</ValEnum>\n<PropName>\nFN\n</PropName>\n<PropName>\nN\n</PropName>\n<PropName>\nTEL\n</PropName>\n<ParamName>\nPREF\n</ParamName>\n<ParamName>\nWORK\n</ParamName>\n<ParamName>\nHOME\n</ParamName>\n<ParamName>\nCELL\n</ParamName>\n<ParamName>\nFAX\n</ParamName>\n<ParamName>\nPAGER\n</ParamName>\n<PropName>\nEMAIL\n</PropName>\n<ParamName>\nINTERNET\n</ParamName>\n<PropName>\nCHARSET\n</PropName>\n</CTCap>\n</DevInf>\n</Data>\n</Item>\n</Put>\n<Final>\n</Final>\n</SyncBody>\n</SyncML>\n"; - SmlError *error = NULL; + GError *error = 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; @@ -963,8 +964,8 @@ sml_fail_unless(cmd == NULL, NULL); sml_fail_unless(error == NULL, NULL); - SmlBool final = FALSE; - SmlBool end = TRUE; + gboolean final = FALSE; + gboolean end = TRUE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == TRUE, NULL); @@ -977,9 +978,9 @@ START_TEST (xml_parser_large_obj) { const char *data = "<SyncML xmlns=\"SYNCML:SYNCML1.2\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.2</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>3</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><NumberOfChanges>1</NumberOfChanges><Add><CmdID>4</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type><Size>200</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData></MoreData></Item></Add></Sync><Final></Final></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -1026,8 +1027,8 @@ sml_fail_unless(cmd == NULL, NULL); sml_fail_unless(error == NULL, NULL); - SmlBool final = FALSE; - SmlBool end = TRUE; + gboolean final = FALSE; + gboolean end = TRUE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == TRUE, NULL); @@ -1040,9 +1041,9 @@ START_TEST (xml_parser_large_obj2) { const char *data = "<SyncML xmlns=\"SYNCML:SYNCML1.2\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.2</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>3</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><NumberOfChanges>1</NumberOfChanges><Add><CmdID>4</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type><Size>200</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData/></Item></Add></Sync><Final></Final></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -1089,8 +1090,8 @@ sml_fail_unless(cmd == NULL, NULL); sml_fail_unless(error == NULL, NULL); - SmlBool final = FALSE; - SmlBool end = TRUE; + gboolean final = FALSE; + gboolean end = TRUE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == TRUE, NULL); @@ -1103,9 +1104,9 @@ START_TEST (xml_parser_large_obj_error) { const char *data = "<SyncML xmlns=\"SYNCML:SYNCML1.2\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.2</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>3</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><NumberOfChanges>1</NumberOfChanges><Add><CmdID>4</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type><Size>200</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData></MoreData></Item></Add><Add><CmdID>4</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type><Size>200</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data></Item></Add></Sync><Final></Final></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -1147,18 +1148,18 @@ sml_fail_unless(smlParserGetCommand(parser, &cmd, &error) == SML_PARSER_RESULT_ERROR, NULL); sml_fail_unless(cmd == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(smlParserGetCommand(parser, &cmd, &error) == SML_PARSER_RESULT_ERROR, NULL); sml_fail_unless(cmd == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); - SmlBool final = FALSE; - SmlBool end = TRUE; + gboolean final = FALSE; + gboolean end = TRUE; sml_fail_unless(!smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlParserFree(parser); } @@ -1167,9 +1168,9 @@ START_TEST (xml_parser_large_obj_mangled) { const char *data = "<SyncML xmlns=\"SYNCML:SYNCML1.2\"><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.2</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source></SyncHdr><SyncBody><Sync><CmdID>3</CmdID><Target><LocURI>/vcards</LocURI></Target><Source><LocURI>/vcards</LocURI></Source><NumberOfChanges>1</NumberOfChanges><Add><CmdID>4</CmdID><Meta><Type xmlns=\"syncml:metinf\">text/x-vcard</Type></Meta><Item><Source><LocURI>uid</LocURI></Source><Meta><Size>10</Size></Meta><Data><![CDATA[data\r\n\r\nda]]></Data><MoreData></MoreData></Item></Add></Sync><Final></Final></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -1223,8 +1224,8 @@ sml_fail_unless(cmd == NULL, NULL); sml_fail_unless(error == NULL, NULL); - SmlBool final = FALSE; - SmlBool end = TRUE; + gboolean final = FALSE; + gboolean end = TRUE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == TRUE, NULL); @@ -1239,9 +1240,9 @@ g_type_init(); const char *data = "<?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>21</SessionID><MsgID>1</MsgID><Target><LocURI>PC Suite</LocURI></Target><Source><LocURI>IMEI:XXXX</LocURI></Source><Meta><MaxMsgSize xmlns=\"syncml:metinf\">10000</MaxMsgSize></Meta></SyncHdr><SyncBody><Put><CmdID>8</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>3.04.37</SwV><DevID>IMEI:XXXX</DevID><DevTyp>phone</DevTyp><SupportLargeObjs/><SupportNumberOfChanges/><DataStore><SourceRef>./C\\Systemata\\Calendar</SourceRef><MaxGUIDSize>8</MaxGUIDSize><Rx-Pref><CTType>text/x-vcalendar</CTType><VerCT>1.0</VerCT></Rx-Pref><Rx><CTType>text/calendar</CTType><VerCT>2.0</VerCT></Rx><Tx-Pref><CTType>text/x-vcalendar</CTType><VerCT>1.0</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><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><DataStore><SourceRef>./C\\System\\Data\\Notepad.dat</SourceRef><MaxGUIDSize>8</MaxGUIDSize><Rx-Pref><CTType>text/plain</CTType><VerCT>1.0</VerCT></Rx-Pref><Rx><CTType>text/plain</CTType><VerCT>1.0</VerCT></Rx><Tx-Pref><CTType>text/plain</CTType><VerCT>1.0</VerCT></Tx-Pref><Tx><CTType>text/plain</CTType><VerCT>1.0</VerCT></Tx><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-vcalendar</CTType><PropName>BEGIN</PropName><ValEnum>VCALENDAR</ValEnum><ValEnum>VEVENT</ValEnum><ValEnum>VTODO</ValEnum><PropName>END</PropName><ValEnum>VCALENDAR</ValEnum><ValEnum>VEVENT</ValEnum><ValEnum>VTODO</ValEnum><PropName>VERSION</PropName><ValEnum>1.0</ValEnum><PropName>UID</PropName><PropName>SUMMARY</PropName><PropName>DESCRIPTION</PropName><PropName>DTEND</PropName><PropName>DTSTART</PropName><PropName>AALARM</PropName><ParamName>TYPE</ParamName><PropName>CLASS</PropName><ValEnum>PUBLIC</ValEnum><ValEnum>PRIVATE</ValEnum><ValEnum>CONFIDENTIAL</ValEnum><PropName>COMPLETED</PropName><PropName>LOCATION</PropName><PropName>DCREATED</PropName><PropName>LAST-MODIFIED</PropName><PropName>PRIORITY</PropName><PropName>STATUS</PropName><PropName>RRULE</PropName><PropName>DUE</PropName><PropName>EXDATE</PropName><PropName>X-EPOCAGENDAENTRYTYPE</PropName><CTType>text/calendar</CTType><PropName>BEGIN</PropName><ValEnum>VCALENDAR</ValEnum><ValEnum>VEVENT</ValEnum><ValEnum>VTODO</ValEnum><PropName>END</PropName><ValEnum>VCALENDAR</ValEnum><ValEnum>VEVENT</ValEnum><ValEnum>VTODO</ValEnum><PropName>VERSION</PropName><ValEnum>2.0</ValEnum><PropName>UID</PropName><PropName>SUMMARY</PropName><PropName>DESCRIPTION</PropName><PropName>DTEND</PropName><PropName>DTSTART</PropName><PropName>AALARM</PropName><ParamName>TYPE</ParamName><PropName>CLASS</PropName><ValEnum>PUBLIC</ValEnum><ValEnum>PRIVATE</ValEnum><ValEnum>CONFIDENTIAL</ValEnum><PropName>COMPLETED</PropName><PropName>LOCATION</PropName><PropName>DCREATED</PropName><PropName>LAST-MODIFIED</PropName><PropName>PRIORITY</PropName><PropName>STATUS</PropName><PropName>RRULE</PropName><PropName>DUE</PropName><PropName>EXDATE</PropName><PropName>X-EPOCAGENDAENTRYTYPE</PropName><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><CTType>text/plain</CTType></CTCap></DevInf></Data></Item></Put><Final/></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -1272,7 +1273,7 @@ sml_fail_unless(error == NULL, NULL); SmlDevInf *devinf = smlXmlDevInfParse(buffer, size, &error); - sml_fail_unless(devinf != NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(devinf != NULL, "%s", error->message); sml_fail_unless(error == NULL, NULL); g_object_unref(devinf); @@ -1282,8 +1283,8 @@ sml_fail_unless(cmd == NULL, NULL); sml_fail_unless(error == NULL, NULL); - SmlBool final = FALSE; - SmlBool end = TRUE; + gboolean final = FALSE; + gboolean end = TRUE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == TRUE, NULL); @@ -1298,9 +1299,9 @@ g_type_init(); const char *data = "<?xml version=\"1.0\"?><!DOCTYPE SyncML PUBLIC \"-//SYNCML//DTD SyncML 1.2//EN\" \"http://www.openmobilealliance.org/tech/DTD/OMA-TS-SyncML_RepPro_DTD-V1_2.dtd\"><SyncML xmlns=\"syncml:SYNCML1.2\"><SyncHdr><VerDTD>1.2</VerDTD><VerProto>SyncML/1.2</VerProto><SessionID>1</SessionID><MsgID>1</MsgID><Target><LocURI>LibSyncML Test Suite</LocURI></Target><Source><LocURI>IMEI:xxxxxxxxxxxxxxx</LocURI></Source><Meta><MaxMsgSize xmlns=\"syncml:metinf\">6000</MaxMsgSize></Meta></SyncHdr><SyncBody><Put><CmdID>1</CmdID><Meta><Type xmlns=\"syncml:metinf\">application/vnd.syncml-devinf+wbxml</Type></Meta><Item><Source><LocURI>./devinf12</LocURI></Source><Data><DevInf xmlns=\"syncml:devinf\"><VerDTD>1.2</VerDTD><Man>SonyEricsson</Man><Mod>K850i</Mod><FwV>R1CA029</FwV><SwV>R7A</SwV><HwV>R6A</HwV><DevID>IMEI:xxxxxxxxxxxxxxx</DevID><DevTyp>phone</DevTyp><UTC/><SupportNumberOfChanges/><SupportLargeObjs/><DataStore><SourceRef>Contacts</SourceRef><DisplayName>Contacts</DisplayName><MaxGUIDSize>64</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><CTCap><CTType>text/x-vcard</CTType><VerCT>2.1</VerCT><Property><PropName>X-IRMC-LUID</PropName><Size>12</Size></Property><Property><PropName>GEO</PropName></Property><Property><PropName>PHOTO</PropName><Size>10000</Size><NoTruncate/><PropParam><ParamName>ENCODING</ParamName><ValEnum>BASE64</ValEnum></PropParam></Property><Property><PropName>BDAY</PropName><Size>8</Size></Property><Property><PropName>URL</PropName><Size>120</Size></Property><Property><PropName>TITLE</PropName><Size>30</Size></Property><Property><PropName>ORG</PropName><Size>30</Size></Property><Property><PropName>EMAIL</PropName><MaxOccur>3</MaxOccur><Size>128</Size><NoTruncate/><PropParam><ParamName>TYPE</ParamName><ValEnum>WORK</ValEnum><ValEnum>HOME</ValEnum></PropParam></Property><Property><PropName>ADR</PropName><MaxOccur>2</MaxOccur><Size>125</Size><PropParam><ParamName>TYPE</ParamName><ValEnum>WORK</ValEnum><ValEnum>HOME</ValEnum></PropParam></Property><Property><PropName>NOTE</PropName><Size>512</Size></Property><Property><PropName>TEL</PropName><MaxOccur>7</MaxOccur><Size>80</Size><NoTruncate/><PropParam><ParamName>TYPE</ParamName><ValEnum>CELL;WORK</ValEnum><ValEnum>CELL;HOME</ValEnum><ValEnum>CELL</ValEnum><ValEnum>HOME</ValEnum><ValEnum>FAX</ValEnum><ValEnum>WORK</ValEnum></PropParam></Property><Property><PropName>N</PropName><Size>60</Size></Property><Property><PropName>VERSION</PropName><ValEnum>2.1</ValEnum></Property><Property><PropName>END</PropName><ValEnum>VCARD</ValEnum></Property><Property><PropName>BEGIN</PropName><ValEnum>VCARD</ValEnum></Property></CTCap><CTCap><CTType>text/vcard</CTType><VerCT>3.0</VerCT><Property><PropName>X-IRMC-LUID</PropName><Size>12</Size></Property><Property><PropName>GEO</PropName></Property><Property><PropName>PHOTO</PropName><Size>10000</Size><NoTruncate/><PropParam><ParamName>ENCODING</ParamName><ValEnum>BASE64</ValEnum></PropParam></Property><Property><PropName>BDAY</PropName><Size>8</Size></Property><Property><PropName>URL</PropName><Size>120</Size></Property><Property><PropName>TITLE</PropName><Size>30</Size></Property><Property><PropName>ORG</PropName><Size>30</Size></Property><Property><PropName>EMAIL</PropName><MaxOccur>3</MaxOccur><Size>128</Size><NoTruncate/><PropParam><ParamName>TYPE</ParamName><ValEnum>WORK</ValEnum><ValEnum>HOME</ValEnum></PropParam></Property><Property><PropName>ADR</PropName><MaxOccur>2</MaxOccur><Size>125</Size><PropParam><ParamName>TYPE</ParamName><ValEnum>WORK</ValEnum><ValEnum>HOME</ValEnum></PropParam></Property><Property><PropName>NOTE</PropName><Size>512</Size></Property><Property><PropName>TEL</PropName><MaxOccur>7</MaxOccur><Size>80</Size><NoTruncate/><PropParam><ParamName>TYPE</ParamName><ValEnum>CELL;WORK</ValEnum><ValEnum>CELL;HOME</ValEnum><ValEnum>CELL</ValEnum><ValEnum>HOME</ValEnum><ValEnum>FAX</ValEnum><ValEnum>WORK</ValEnum></PropParam></Property><Property><PropName>N</PropName><Size>60</Size></Property><Property><PropName>VERSION</PropName><ValEnum>3.0</ValEnum></Property><Property><PropName>END</PropName><ValEnum>VCARD</ValEnum></Property><Property><PropName>BEGIN</PropName><ValEnum>VCARD</ValEnum></Property></CTCap><DSMem><MaxID>5000</MaxID></DSMem><SyncCap><SyncType>1</SyncType><SyncType>2</SyncType><SyncType>4</SyncType><SyncType>6</SyncType><SyncType>7</SyncType></SyncCap></DataStore><DataStore><SourceRef>Calendar</SourceRef><DisplayName>Calendar</DisplayName><MaxGUIDSize>64</MaxGUIDSize><Rx-Pref><CTType>text/x-vcalendar</CTType><VerCT>1.0</VerCT></Rx-Pref><Tx-Pref><CTType>text/x-vcalendar</CTType><VerCT>1.0</VerCT></Tx-Pref><CTCap><CTType>text/x-vcalendar</CTType><VerCT>1.0</VerCT><Property><PropName>X-IRMC-LUID</PropName><Size>12</Size></Property><Property><PropName>X-SONYERICSSON-DST</PropName></Property><Property><PropName>DAYLIGHT</PropName></Property><Property><PropName>LAST-MODIFIED</PropName></Property><Property><PropName>EXDATE</PropName></Property><Property><PropName>RRULE</PropName><Size>50</Size></Property><Property><PropName>CLASS</PropName><ValEnum>PUBLIC</ValEnum></Property><Property><PropName>CATEGORIES</PropName><ValEnum>BIRTHDAY</ValEnum><ValEnum>HOLIDAY</ValEnum><ValEnum>VACATION</ValEnum><ValEnum>TRAVEL</ValEnum><ValEnum>PHONE CALL</ValEnum><ValEnum>MISCELLANEOUS</ValEnum><ValEnum>MEETING</ValEnum></Property><Property><PropName>AALARM</PropName></Property><Property><PropName>DALARM</PropName></Property><Property><PropName>DTEND</PropName></Property><Property><PropName>DTSTART</PropName></Property><Property><PropName>DESCRIPTION</PropName><Size>512</Size></Property><Property><PropName>LOCATION</PropName><Size>50</Size></Property><Property><PropName>SUMMARY</PropName><Size>200</Size></Property><Property><PropName>VERSION</PropName><ValEnum>1.0</ValEnum></Property><Property><PropName>END</PropName><ValEnum>VEVENT</ValEnum><ValEnum>VCALENDAR</ValEnum></Property><Property><PropName>BEGIN</PropName><ValEnum>VEVENT</ValEnum><ValEnum>VCALENDAR</ValEnum></Property></CTCap><DSMem><MaxID>1000</MaxID></DSMem><SyncCap><SyncType>1</SyncType><SyncType>2</SyncType><SyncType>4</SyncType><SyncType>6</SyncType><SyncType>7</SyncType></SyncCap></DataStore><DataStore><SourceRef>Tasks</SourceRef><DisplayName>Tasks</DisplayName><MaxGUIDSize>64</MaxGUIDSize><Rx-Pref><CTType>text/x-vcalendar</CTType><VerCT>1.0</VerCT></Rx-Pref><Tx-Pref><CTType>text/x-vcalendar</CTType><VerCT>1.0</VerCT></Tx-Pref><CTCap><CTType>text/x-vcalendar</CTType><VerCT>1.0</VerCT><Property><PropName>X-IRMC-LUID</PropName><Size>12</Size></Property><Property><PropName>X-SONYERICSSON-DST</PropName></Property><Property><PropName>DAYLIGHT</PropName></Property><Property><PropName>LAST-MODIFIED</PropName></Property><Property><PropName>CLASS</PropName><ValEnum>PUBLIC</ValEnum></Property><Property><PropName>CATEGORIES</PropName><ValEnum>BIRTHDAY</ValEnum><ValEnum>HOLIDAY</ValEnum><ValEnum>VACATION</ValEnum><ValEnum>TRAVEL</ValEnum><ValEnum>PHONE CALL</ValEnum><ValEnum>MISCELLANEOUS</ValEnum><ValEnum>MEETING</ValEnum></Property><Property><PropName>STATUS</PropName><ValEnum>COMPLETED</ValEnum><ValEnum>NEEDS ACTION</ValEnum><ValEnum>ACCEPTED</ValEnum></Property><Property><PropName>PRIORITY</PropName></Property><Property><PropName>DUE</PropName></Property><Property><PropName>COMPLETED</PropName></Property><Property><PropName>AALARM</PropName></Property><Property><PropName>DALARM</PropName></Property><Property><PropName>DESCRIPTION</PropName><Size>512</Size></Property><Property><PropName>SUMMARY</PropName><Size>200</Size></Property><Property><PropName>VERSION</PropName><ValEnum>1.0</ValEnum></Property><Property><PropName>END</PropName><ValEnum>VCALENDAR</ValEnum><ValEnum>VTODO</ValEnum></Property><Property><PropName>BEGIN</PropName><ValEnum>VCALENDAR</ValEnum><ValEnum>VTODO</ValEnum></Property></CTCap><DSMem><MaxID>250</MaxID></DSMem><SyncCap><SyncType>1</SyncType><SyncType>2</SyncType><SyncType>4</SyncType><SyncType>6</SyncType><SyncType>7</SyncType></SyncCap></DataStore><DataStore><SourceRef>Notes</SourceRef><DisplayName>Notes</DisplayName><MaxGUIDSize>64</MaxGUIDSize><Rx-Pref><CTType>text/plain</CTType><VerCT>1.0</VerCT></Rx-Pref><Tx-Pref><CTType>text/plain</CTType><VerCT>1.0</VerCT></Tx-Pref><CTCap><CTType>text/plain</CTType><VerCT>1.0</VerCT><Property><PropName>BODY</PropName><Size>254</Size></Property></CTCap><DSMem><MaxID>50</MaxID></DSMem><SyncCap><SyncType>1</SyncType><SyncType>2</SyncType><SyncType>4</SyncType><SyncType>6</SyncType><SyncType>7</SyncType></SyncCap></DataStore><DataStore><SourceRef>Bookmarks</SourceRef><DisplayName>Bookmarks</DisplayName><MaxGUIDSize>64</MaxGUIDSize><Rx-Pref><CTType>text/x-vbookmark</CTType><VerCT>1.0</VerCT></Rx-Pref><Tx-Pref><CTType>text/x-vbookmark</CTType><VerCT>1.0</VerCT></Tx-Pref><CTCap><CTType>text/x-vbookmark</CTType><VerCT>1.0</VerCT><Property><PropName>X-SONYERICSSON-ICON</PropName><Size>256</Size><PropParam><ParamName>ENCODING</ParamName><ValEnum>BASE64</ValEnum></PropParam></Property><Property><PropName>X-IRMC-URL</PropName></Property><Property><PropName>URL</PropName><Size>1024</Size></Property><Property><PropName>TITLE</PropName><Size>31</Size></Property><Property><PropName>BEGIN</PropName><ValEnum>VENV</ValEnum><ValEnum>VBKM</ValEnum></Property><Property><PropName>END</PropName><ValEnum>VENV</ValEnum><ValEnum>VBKM</ValEnum></Property><Property><PropName>VERSION</PropName><ValEnum>1.0</ValEnum></Property></CTCap><SyncCap><SyncType>1</SyncType><SyncType>2</SyncType><SyncType>4</SyncType><SyncType>6</SyncType><SyncType>7</SyncType></SyncCap></DataStore></DevInf></Data></Item></Put><Final/></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -1338,8 +1339,8 @@ smlCommandUnref(cmd); - SmlBool final = FALSE; - SmlBool end = TRUE; + gboolean final = FALSE; + gboolean end = TRUE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == TRUE, NULL); @@ -1356,9 +1357,9 @@ /* The following string has been sent by a SE P1i */ const char *data = "<?xml version=\"1.0\"?><!DOCTYPE SyncML PUBLIC \"-//SYNCML//DTD SyncML 1.2//EN\" \"http://www.openmobilealliance.org/tech/DTD/OMA-TS-SyncML_RepPro_DTD-V1_2.dtd\"><SyncML xmlns=\"syncml:SYNCML1.2\"><SyncHdr><VerDTD>1.2</VerDTD><VerProto>SyncML/1.2</VerProto><SessionID>9284</SessionID><MsgID>1</MsgID><Target><LocURI>http://192.168.1.102:8080</LocURI></Target><Source><LocURI>IMEI:xxxxxxxxxxxxxxx</LocURI></Source><Meta><MaxMsgSize xmlns=\"syncml:metinf\">10000</MaxMsgSize></Meta></SyncHdr><SyncBody><Put><CmdID>1</CmdID><Meta><Type xmlns=\"syncml:metinf\">application/vnd.syncml-devinf+wbxml</Type></Meta><Item><Source><LocURI>./devinf12</LocURI></Source><Data><DevInf xmlns=\"syncml:devinf\"><VerDTD>1.2</VerDTD><Man>Sony Ericsson</Man><Mod>P1i</Mod><OEM>SymbianUK</OEM><FwV>0</FwV><SwV>Z1.0.1</SwV><HwV>1.0</HwV><DevID>IMEI:xxxxxxxxxxxxxxx</DevID><DevTyp>smartphone</DevTyp><UTC/><SupportLargeObjs/><SupportNumberOfChanges/><DataStore><SourceRef>C:Calendar</SourceRef><DisplayName>Agenda</DisplayName><Rx-Pref><CTType>text/x-vcalendar</CTType><VerCT>1.0</VerCT></Rx-Pref><Tx-Pref><CTType>text/x-vcalendar</CTType><VerCT>1.0</VerCT></Tx-Pref><Rx><CTType>text/x-vcalendar</CTType><VerCT>1.0</VerCT></Rx><Tx><CTType>text/x-vcalendar</CTType><VerCT>1.0</VerCT></Tx><CTCap><CTType>text/x-vcalendar</CTType><VerCT>1.0</VerCT><Property><PropName>AALARM</PropName><DataType>text</DataType></Property><Property><PropName>ATTACH</PropName><DataType>text</DataType></Property><Property><PropName>ATTENDEE</PropName><DataType>text</DataType><PropParam><ParamName>EXPECT</ParamName><DataType>text</DataType></PropParam><PropParam><ParamName>ROLE</ParamName><DataType>text</DataType></PropParam><PropParam><ParamName>RSVP</ParamName><DataType>text</DataType></PropParam><PropParam><ParamName>STATUS</ParamName><DataType>text</DataType></PropParam></Property><Property><PropName>BEGIN</PropName><DataType>text</DataType><ValEnum>VCALENDAR</ValEnum><ValEnum>VEVENT</ValEnum><ValEnum>VTODO</ValEnum></Property><Property><PropName>CATEGORIES</PropName><DataType>text</DataType></Property><Property><PropName>COMPLETED</PropName><DataType>text</DataType></Property><Property><PropName>CLASS</PropName><DataType>text</DataType><ValEnum>PUBLIC</ValEnum><ValEnum>PRIVATE</ValEnum><ValEnum>CONFIDENTIAL</ValEnum></Property><Property><PropName>DAYLIGHT</PropName><DataType>text</DataType></Property><Property><PropName>DCREATED</PropName><DataType>text</DataType></Property><Property><PropName>DESCRIPTION</PropName><DataType>text</DataType></Property><Property><PropName>DTSTART</PropName><DataType>text</DataType></Property><Property><PropName>DTEND</PropName><DataType>text</DataType></Property><Property><PropName>DUE</PropName><DataType>text</DataType></Property><Property><PropName>END</PropName><DataType>text</DataType><ValEnum>VCALENDAR</ValEnum><ValEnum>VEVENT</ValEnum><ValEnum>VTODO</ValEnum></Property><Property><PropName>EXDATE</PropName><DataType>text</DataType></Property><Property><PropName>LAST-MODIFIED</PropName><DataType>text</DataType></Property><Property><PropName>LOCATION</PropName><DataType>text</DataType></Property><Property><PropName>PRIORITY</PropName><DataType>text</DataType></Property><Property><PropName>RRULE</PropName><DataType>text</DataType></Property><Property><PropName>STATUS</PropName><DataType>text</DataType></Property><Property><PropName>SUMMARY</PropName><DataType>text</DataType></Property><Property><PropName>UID</PropName><DataType>text</DataType></Property><Property><PropName>VERSION</PropName><DataType>text</DataType><ValEnum>1.0</ValEnum></Property><Property><PropName>X-EPOCALARM</PropName><DataType>text</DataType><PropParam><ParamName>VALUE</ParamName><DataType>text</DataType><ValEnum>INLINE</ValEnum><ValEnum>URL</ValEnum></PropParam><PropParam><ParamName>ENCODING</ParamName><DataType>text</DataType><ValEnum>BASE64</ValEnum></PropParam><PropParam><ParamName>X-CONTENTTYPE</ParamName><DataType>text</DataType></PropParam></Property><Property><PropName>X-EPOCAGENDAENTRYTYPE</PropName><DataType>text</DataType><ValEnum>APPOINTMENT</ValEnum><ValEnum>ANNIVERSARY</ValEnum><ValEnum>EVENT</ValEnum><ValEnum>TODO</ValEnum><ValEnum>REMINDER</ValEnum></Property></CTCap><SyncCap><SyncType>1</SyncType><SyncType>2</SyncType><SyncType>3</SyncType><SyncType>5</SyncType><SyncType>6</SyncType><SyncType>4</SyncType><SyncType>7</SyncType></SyncCap></DataStore></DevInf></Data></Item></Put><Final/></SyncBody></SyncML>"; - SmlError *error = NULL; + GError *error = 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; @@ -1399,8 +1400,8 @@ sml_fail_unless(cmd == NULL, NULL); sml_fail_unless(error == NULL, NULL); - SmlBool final = FALSE; - SmlBool end = TRUE; + gboolean final = FALSE; + gboolean end = TRUE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == TRUE, NULL); @@ -1422,9 +1423,9 @@ const char *data = "<?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>21</SessionID><MsgID>1</MsgID><Target><LocURI>PC Suite</LocURI></Target><Source><LocURI>IMEI:XXXX</LocURI></Source><Meta><MaxMsgSize xmlns=\"syncml:metinf\">10000</MaxMsgSize></Meta></SyncHdr><SyncBody><Put><CmdID>8</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>3.04.37</SwV><DevID>IMEI:XXXX</DevID><DevTyp>phone</DevTyp><SupportLargeObjs/><SupportNumberOfChanges/><DataStore><SourceRef>./C\\Systemata\\Calendar</SourceRef><MaxGUIDSize>8</MaxGUIDSize><Rx-Pref><CTType>text/x-vcalendar</CTType><VerCT>1.0</VerCT></Rx-Pref><Rx><CTType>text/calendar</CTType><VerCT>2.0</VerCT></Rx><Tx-Pref><CTType>text/x-vcalendar</CTType><VerCT>1.0</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><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><DataStore><SourceRef>./C\\System\\Data\\Notepad.dat</SourceRef><MaxGUIDSize>8</MaxGUIDSize><Rx-Pref><CTType>text/plain</CTType><VerCT>1.0</VerCT></Rx-Pref><Rx><CTType>text/plain</CTType><VerCT>1.0</VerCT></Rx><Tx-Pref><CTType>text/plain</CTType><VerCT>1.0</VerCT></Tx-Pref><Tx><CTType>text/plain</CTType><VerCT>1.0</VerCT></Tx><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-vcalendar</CTType><PropName>BEGIN</PropName><ValEnum>VCALENDAR</ValEnum><ValEnum>VEVENT</ValEnum><ValEnum>VTODO</ValEnum><PropName>END</PropName><ValEnum>VCALENDAR</ValEnum><ValEnum>VEVENT</ValEnum><ValEnum>VTODO</ValEnum><PropName>VERSION</PropName><ValEnum>1.0</ValEnum><PropName>UID</PropName><PropName>SUMMARY</PropName><PropName>DESCRIPTION</PropName><PropName>DTEND</PropName><PropName>... [truncated message content] |
