Menu
▾
▴
[Opensync-commits] r1188 - trunk/tests
|
From: <svn...@op...> - 2009-07-13 12:48:06
|
Author: bellmich Date: Mon Jul 13 14:47:56 2009 New Revision: 1188 URL: http://libsyncml.opensync.org/changeset/1188 Log: fixed wrong error handling Modified: trunk/tests/check_xml_parser.c Modified: trunk/tests/check_xml_parser.c ============================================================================== --- trunk/tests/check_xml_parser.c Mon Jul 13 14:47:38 2009 (r1187) +++ trunk/tests/check_xml_parser.c Mon Jul 13 14:47:56 2009 (r1188) @@ -75,7 +75,7 @@ const char *data = "<SyncML><SyncHdr></SyncHdr></SyncML>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -109,7 +109,7 @@ const char *data = "<SyncML><SyncHdr></SyncHdr><SyncBody></SyncBody></SyncML>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -132,7 +132,7 @@ const char *data = "<SyncML><SyncHdr><VerProto>SyncML/1.1</VerProto></SyncHdr><SyncBody></SyncBody></SyncML>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -155,7 +155,7 @@ const char *data = "<SyncML><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD></SyncHdr><SyncBody></SyncBody></SyncML>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -178,7 +178,7 @@ const char *data = "<SyncML><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID></SyncHdr><SyncBody></SyncBody></SyncML>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -201,7 +201,7 @@ const char *data = "<SyncML><SyncHdr><VerProto>SyncML/1.1</VerProto><VerDTD>1.1</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID></SyncHdr><SyncBody></SyncBody></SyncML>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -224,7 +224,7 @@ 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>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -247,7 +247,7 @@ 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>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -287,7 +287,7 @@ 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", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -327,7 +327,7 @@ 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>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -350,7 +350,7 @@ 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>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -386,7 +386,7 @@ 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>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -414,7 +414,7 @@ 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>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -442,7 +442,7 @@ 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>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -470,7 +470,7 @@ 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>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -510,7 +510,7 @@ 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>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -559,7 +559,7 @@ 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>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -608,7 +608,7 @@ 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>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -648,7 +648,7 @@ 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>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -697,7 +697,7 @@ 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>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -746,7 +746,7 @@ 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>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -769,7 +769,7 @@ sml_fail_unless(error == NULL, NULL); SmlCommand *cmd = NULL; - sml_fail_unless(smlParserGetCommand(parser, &cmd, &error), "%s", error->message); + sml_fail_unless(smlParserGetCommand(parser, &cmd, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(cmd != NULL, NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(cmd->cmdID == 1, NULL); @@ -795,7 +795,7 @@ 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>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -844,7 +844,7 @@ 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>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -906,7 +906,7 @@ GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -930,7 +930,7 @@ GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -980,7 +980,7 @@ 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>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -1043,7 +1043,7 @@ 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>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -1106,7 +1106,7 @@ 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>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -1170,7 +1170,7 @@ 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>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -1242,7 +1242,7 @@ GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -1273,7 +1273,7 @@ sml_fail_unless(error == NULL, NULL); SmlDevInf *devinf = smlXmlDevInfParse(buffer, size, &error); - sml_fail_unless(devinf != NULL, "%s", error->message); + sml_fail_unless(devinf != NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(error == NULL, NULL); g_object_unref(devinf); @@ -1301,7 +1301,7 @@ GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -1359,7 +1359,7 @@ GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -1425,7 +1425,7 @@ GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -1456,7 +1456,7 @@ sml_fail_unless(error == NULL, NULL); SmlDevInf *devinf = smlXmlDevInfParse(buffer, size, &error); - sml_fail_unless(devinf != NULL, "%s", error->message); + sml_fail_unless(devinf != NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(error == NULL, NULL); g_object_unref(devinf); @@ -1482,7 +1482,7 @@ const char *data = "<SyncML><SyncHdr><VerProto>SyncML/1.2</VerProto><VerDTD>1.2</VerDTD><MsgID>1</MsgID><SessionID>1</SessionID><Target><LocURI>test</LocURI></Target><Source><LocURI>test</LocURI></Source></SyncHdr><SyncBody><Get><CmdID>2</CmdID><Item><Target><LocURI>./devinf12</LocURI></Target><Data/></Item></Get></SyncBody></SyncML>"; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -1532,7 +1532,7 @@ ; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -1587,7 +1587,7 @@ ; GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -1650,7 +1650,7 @@ GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -1740,7 +1740,7 @@ GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); /* parse header and first status */ @@ -1763,7 +1763,7 @@ /* parse second status with item and meta info */ - sml_fail_unless(smlParserGetStatus(parser, &status, &error), "%s", error->message); + sml_fail_unless(smlParserGetStatus(parser, &status, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(status != NULL, NULL); sml_fail_unless(error == NULL, NULL); smlStatusUnref(status); @@ -1809,7 +1809,7 @@ GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); /* parse header and first status */ @@ -1832,7 +1832,7 @@ /* parse second status with item and meta info */ - sml_fail_unless(smlParserGetStatus(parser, &status, &error), "%s", error->message); + sml_fail_unless(smlParserGetStatus(parser, &status, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(status != NULL, NULL); sml_fail_unless(error == NULL, NULL); smlStatusUnref(status); @@ -1879,7 +1879,7 @@ GError *error = NULL; SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); /* parse header and first status */ @@ -1902,7 +1902,7 @@ /* parse second status with item and meta info */ - sml_fail_unless(smlParserGetStatus(parser, &status, &error), "%s", error->message); + sml_fail_unless(smlParserGetStatus(parser, &status, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(status != NULL, NULL); sml_fail_unless(error == NULL, NULL); smlStatusUnref(status); |
