Menu
▾
▴
opensync-commits — Mailing list that will receive the commit information
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(56) |
Apr
(109) |
May
(15) |
Jun
(3) |
Jul
(37) |
Aug
(96) |
Sep
(40) |
Oct
(4) |
Nov
(54) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(47) |
Feb
(30) |
Mar
(102) |
Apr
(120) |
May
(68) |
Jun
(54) |
Jul
(53) |
Aug
(122) |
Sep
(190) |
Oct
(71) |
Nov
(85) |
Dec
(108) |
| 2007 |
Jan
(72) |
Feb
(190) |
Mar
(53) |
Apr
(101) |
May
(145) |
Jun
(148) |
Jul
(167) |
Aug
(143) |
Sep
(23) |
Oct
(198) |
Nov
(223) |
Dec
(195) |
| 2008 |
Jan
(100) |
Feb
(129) |
Mar
(79) |
Apr
(77) |
May
(34) |
Jun
(95) |
Jul
(112) |
Aug
(160) |
Sep
(82) |
Oct
(124) |
Nov
(199) |
Dec
(355) |
| 2009 |
Jan
(436) |
Feb
(89) |
Mar
(298) |
Apr
(189) |
May
(33) |
Jun
(88) |
Jul
(105) |
Aug
(44) |
Sep
(181) |
Oct
(87) |
Nov
(75) |
Dec
(1) |
| 2010 |
Jan
(63) |
Feb
(21) |
Mar
(3) |
Apr
(1) |
May
(1) |
Jun
(3) |
Jul
(26) |
Aug
(37) |
Sep
(26) |
Oct
(15) |
Nov
(13) |
Dec
|
|
From: <svn...@op...> - 2009-07-13 15:41:59
|
Author: bellmich Date: Mon Jul 13 17:41:49 2009 New Revision: 1203 URL: http://libsyncml.opensync.org/changeset/1203 Log: more robust error setting Question: Is this a GCC feature or a C99 feature? Modified: trunk/libsyncml/sml_error_internals.h Modified: trunk/libsyncml/sml_error_internals.h ============================================================================== --- trunk/libsyncml/sml_error_internals.h Mon Jul 13 16:03:02 2009 (r1202) +++ trunk/libsyncml/sml_error_internals.h Mon Jul 13 17:41:49 2009 (r1203) @@ -29,9 +29,11 @@ smlAssertMsg(*error == NULL, "The error parameter is already filled (ignored error)."); #define SML_ERROR g_quark_from_static_string("Sml") -#define SML_SET_ERROR(error,type,...) \ +#define SML_SET_ERROR(error, type, format, ...) \ {\ - gchar *__sml_error_string = g_strdup_printf(__VA_ARGS__); \ + gchar *__sml_error_string = NULL; \ + if (format) \ + __sml_error_string = g_strdup_printf(format, ##__VA_ARGS__); \ if (__sml_error_string && strlen(__sml_error_string)) \ g_set_error(error, SML_ERROR, type, "%s %s", smlErrorTypeGetMessage(type), __sml_error_string); \ else \ |
|
From: <svn...@op...> - 2009-07-13 14:03:11
|
Author: bellmich Date: Mon Jul 13 16:03:02 2009 New Revision: 1202 URL: http://libsyncml.opensync.org/changeset/1202 Log: fixed compiler warnings from build host gonzo Modified: trunk/tests/check_xml_fix_broken_item_data.c Modified: trunk/tests/check_xml_fix_broken_item_data.c ============================================================================== --- trunk/tests/check_xml_fix_broken_item_data.c Mon Jul 13 15:52:27 2009 (r1201) +++ trunk/tests/check_xml_fix_broken_item_data.c Mon Jul 13 16:03:02 2009 (r1202) @@ -28,7 +28,7 @@ const char *input_data = "askfdjasdkfjasd masldfjasldk<Data>sdafs</Data>adada"; char *fixed_data = NULL; - unsigned int fixed_size = 0; + gsize fixed_size = 0; GError *error = NULL; sml_fail_unless( @@ -49,7 +49,7 @@ const char *input_data = "askfdjasdkfj<Item>sdafs</Item>adada"; char *fixed_data = NULL; - unsigned int fixed_size = 0; + gsize fixed_size = 0; GError *error = NULL; sml_fail_unless( @@ -70,7 +70,7 @@ const char *input_data = "askfdjasdkfj<Item><Data><![CDATA[This is binary data.]]></Data></Item>adada"; char *fixed_data = NULL; - unsigned int fixed_size = 0; + gsize fixed_size = 0; GError *error = NULL; sml_fail_unless( @@ -92,7 +92,7 @@ const char *output_data = "askfdjasdkfj<Item><Data><![CDATA[This is binary data.]]></Data></Item>adada"; char *fixed_data = NULL; - unsigned int fixed_size = 0; + gsize fixed_size = 0; GError *error = NULL; sml_fail_unless( @@ -121,7 +121,7 @@ "adad<Item><Data><![CDATA[test2]]></Data></Item>adada"; char *fixed_data = NULL; - unsigned int fixed_size = 0; + gsize fixed_size = 0; GError *error = NULL; sml_fail_unless( @@ -156,7 +156,7 @@ "adad<Item><Data><![CDATA[test5]]></Data></Item>adada"; char *fixed_data = NULL; - unsigned int fixed_size = 0; + gsize fixed_size = 0; GError *error = NULL; sml_fail_unless( |
|
From: <svn...@op...> - 2009-07-13 13:52:35
|
Author: bellmich Date: Mon Jul 13 15:52:27 2009 New Revision: 1201 URL: http://libsyncml.opensync.org/changeset/1201 Log: dropped SmlError and SmlBool finally Modified: trunk/libsyncml/objects/sml_ds_server_internals.h trunk/libsyncml/sml_queue.c trunk/libsyncml/sml_transport.c trunk/libsyncml/syncml.h trunk/tools/syncml-obex-client.c Modified: trunk/libsyncml/objects/sml_ds_server_internals.h ============================================================================== --- trunk/libsyncml/objects/sml_ds_server_internals.h Mon Jul 13 15:48:19 2009 (r1200) +++ trunk/libsyncml/objects/sml_ds_server_internals.h Mon Jul 13 15:52:27 2009 (r1201) @@ -72,8 +72,8 @@ GList *recvSync; GList *recvChanges; SmlErrorType syncReply; - SmlBool finalLock; - SmlBool emptySync; + gboolean finalLock; + gboolean emptySync; /** Callback that will receive the reply to the sync command */ SmlStatusReplyCb sentSyncCallback; Modified: trunk/libsyncml/sml_queue.c ============================================================================== --- trunk/libsyncml/sml_queue.c Mon Jul 13 15:48:19 2009 (r1200) +++ trunk/libsyncml/sml_queue.c Mon Jul 13 15:52:27 2009 (r1201) @@ -135,7 +135,7 @@ smlQueueCheckPrio (SmlQueue *queue) { g_mutex_lock(queue->mutex); - SmlBool ret = (queue->prio == NULL) ? FALSE : TRUE; + gboolean ret = (queue->prio == NULL) ? FALSE : TRUE; g_mutex_unlock(queue->mutex); return ret; @@ -145,7 +145,7 @@ smlQueueCheck (SmlQueue *queue) { g_mutex_lock(queue->mutex); - SmlBool ret = (queue->head == NULL) ? FALSE : TRUE; + gboolean ret = (queue->head == NULL) ? FALSE : TRUE; g_mutex_unlock(queue->mutex); return ret; Modified: trunk/libsyncml/sml_transport.c ============================================================================== --- trunk/libsyncml/sml_transport.c Mon Jul 13 15:48:19 2009 (r1200) +++ trunk/libsyncml/sml_transport.c Mon Jul 13 15:52:27 2009 (r1201) @@ -207,7 +207,7 @@ smlTrace(TRACE_ENTRY, "%s(%p, %p, %i, %p, %p)", __func__, tsp, link_, type, data, error); smlAssert(tsp); - SmlBool ret = TRUE; + gboolean ret = TRUE; if (tsp->event_callback == NULL) { smlTrace(TRACE_INTERNAL, "%s: no callback available", __func__); Modified: trunk/libsyncml/syncml.h ============================================================================== --- trunk/libsyncml/syncml.h Mon Jul 13 15:48:19 2009 (r1200) +++ trunk/libsyncml/syncml.h Mon Jul 13 15:52:27 2009 (r1201) @@ -64,7 +64,6 @@ /************************************************************** * Structs *************************************************************/ -typedef struct SmlError SmlError; typedef struct SmlTransport SmlTransport; typedef struct SmlParser SmlParser; typedef struct SmlAssembler SmlAssembler; @@ -84,7 +83,6 @@ typedef struct SmlObject SmlObject; typedef struct SmlManager SmlManager; typedef struct SmlLink SmlLink; -typedef int SmlBool; #include <libsyncml/sml_defines.h> #include <libsyncml/sml_error.h> Modified: trunk/tools/syncml-obex-client.c ============================================================================== --- trunk/tools/syncml-obex-client.c Mon Jul 13 15:48:19 2009 (r1200) +++ trunk/tools/syncml-obex-client.c Mon Jul 13 15:52:27 2009 (r1201) @@ -50,7 +50,7 @@ GList *dbSlow = NULL; GList *dbTypes = NULL; -SmlBool onlyInfo = FALSE; +gboolean onlyInfo = FALSE; char *useTimeAnchor = NULL; unsigned int recvLimit = 65535; unsigned int maxObjSize = 3000000; @@ -87,7 +87,7 @@ exit (ecode); } -static SmlBool _recv_change(SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, unsigned int size, const char *contenttype, void *userdata, SmlError **error) +static gboolean _recv_change(SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, unsigned int size, const char *contenttype, void *userdata, SmlError **error) { smlTrace(TRACE_ENTRY, "%s(%p, %i, %s, %p, %i, %s, %p, %p)", __func__, dsession, type, VA_STRING(uid), data, size, VA_STRING(contenttype), userdata, error); @@ -207,7 +207,7 @@ smlTrace(TRACE_EXIT, "%s", __func__); } -static SmlBool _recv_alert(SmlDsSession *dsession, SmlAlertType type, const char *last, const char *next, void *userdata) +static gboolean _recv_alert(SmlDsSession *dsession, SmlAlertType type, const char *last, const char *next, void *userdata) { smlTrace(TRACE_ENTRY, "%s(%p, %i, %s, %s, %p)", __func__, dsession, type, VA_STRING(last), VA_STRING(next), userdata); SmlError *error = NULL; @@ -217,7 +217,7 @@ printf("Received an Alert for the DS Server at %s: Type: %i, Last %s, Next %s\n", smlDsSessionGetLocation(dsession), type, last, next); - SmlBool slow = FALSE; + gboolean slow = FALSE; int i = 0; for (i = 0; i < g_list_length(dbTypes); i++) { if (!strcmp(smlDsSessionGetContentType(dsession), g_list_nth_data(dbTypes, i))) { @@ -278,10 +278,10 @@ smlTrace(TRACE_EXIT, "%s", __func__); } -SmlBool dumpinfo = FALSE; -SmlBool useStringTable = FALSE; -SmlBool useNumberOfChanges = TRUE; -SmlBool useLargeObjs = TRUE; +gboolean dumpinfo = FALSE; +gboolean useStringTable = FALSE; +gboolean useNumberOfChanges = TRUE; +gboolean useLargeObjs = TRUE; SmlProtocolVersion sessionVersion = SML_VERSION_UNKNOWN; SmlDevInf *deviceDevinf = NULL; SmlDevInf *devinf = NULL; |
|
From: <svn...@op...> - 2009-07-13 13:48:28
|
Author: bellmich Date: Mon Jul 13 15:48:19 2009 New Revision: 1200 URL: http://libsyncml.opensync.org/changeset/1200 Log: fixed several warnings discovered by build host gonzo Modified: trunk/libsyncml/objects/sml_devinf_obj.c trunk/libsyncml/objects/sml_ds_server.c trunk/libsyncml/parser/sml_xml_assm.c trunk/libsyncml/parser/sml_xml_parse.c trunk/libsyncml/sml_command.c trunk/libsyncml/sml_elements_internals.h trunk/libsyncml/sml_notification.c trunk/libsyncml/sml_parse.c trunk/libsyncml/sml_session.c trunk/tests/check_data_sync_api.c trunk/tests/check_ds.c trunk/tests/check_san.c trunk/tests/check_session.c trunk/tests/check_sync.c trunk/tests/check_wbxml_assembler.c trunk/tests/check_wbxml_parser.c trunk/tests/check_xml_assembler.c trunk/tests/check_xml_parser.c trunk/tools/syncml-ds-tool.c Modified: trunk/libsyncml/objects/sml_devinf_obj.c ============================================================================== --- trunk/libsyncml/objects/sml_devinf_obj.c Mon Jul 13 15:21:01 2009 (r1199) +++ trunk/libsyncml/objects/sml_devinf_obj.c Mon Jul 13 15:48:19 2009 (r1200) @@ -143,7 +143,7 @@ } char *data = NULL; - unsigned int size = 0; + gsize size = 0; if (!smlItemGetData(item, &data, &size, &error)) goto error; @@ -337,7 +337,7 @@ SmlDevInfAgent *agent = userdata; GError *error = NULL; char *data = NULL; - unsigned int size = 0; + gsize size = 0; if (!smlItemGetData(cmd->private.access.item, &data, &size, &error)) goto error; Modified: trunk/libsyncml/objects/sml_ds_server.c ============================================================================== --- trunk/libsyncml/objects/sml_ds_server.c Mon Jul 13 15:21:01 2009 (r1199) +++ trunk/libsyncml/objects/sml_ds_server.c Mon Jul 13 15:48:19 2009 (r1200) @@ -653,7 +653,7 @@ } char *data = NULL; - unsigned int size = 0; + gsize size = 0; if (!smlItemStealData(item, &data, &size, &error)) goto error; Modified: trunk/libsyncml/parser/sml_xml_assm.c ============================================================================== --- trunk/libsyncml/parser/sml_xml_assm.c Mon Jul 13 15:21:01 2009 (r1199) +++ trunk/libsyncml/parser/sml_xml_assm.c Mon Jul 13 15:48:19 2009 (r1200) @@ -437,7 +437,7 @@ goto error; } else { char *data = NULL; - unsigned int size = 0; + gsize size = 0; if (!smlItemGetData(item, &data, &size, error)) goto error; Modified: trunk/libsyncml/parser/sml_xml_parse.c ============================================================================== --- trunk/libsyncml/parser/sml_xml_parse.c Mon Jul 13 15:21:01 2009 (r1199) +++ trunk/libsyncml/parser/sml_xml_parse.c Mon Jul 13 15:48:19 2009 (r1200) @@ -895,7 +895,7 @@ break; default:; char *data = NULL; - unsigned int size = 0; + gsize size = 0; if (!_smlXmlParserGetData(parser, &data, &size, SML_ELEMENT_DATA, error)) goto error; Modified: trunk/libsyncml/sml_command.c ============================================================================== --- trunk/libsyncml/sml_command.c Mon Jul 13 15:21:01 2009 (r1199) +++ trunk/libsyncml/sml_command.c Mon Jul 13 15:48:19 2009 (r1200) @@ -707,7 +707,7 @@ SmlLocation *source = NULL; char *data = NULL; - unsigned int size = 0; + gsize size = 0; if (!smlXmlDevInfAssemble(devinf, version, &data, &size, error)) goto error; @@ -790,7 +790,7 @@ g_object_unref(source); char *data = NULL; - unsigned int size = 0; + gsize size = 0; if (!smlXmlDevInfAssemble(devinf, version, &data, &size, error)) goto error; Modified: trunk/libsyncml/sml_elements_internals.h ============================================================================== --- trunk/libsyncml/sml_elements_internals.h Mon Jul 13 15:21:01 2009 (r1199) +++ trunk/libsyncml/sml_elements_internals.h Mon Jul 13 15:48:19 2009 (r1200) @@ -71,8 +71,8 @@ gchar *responseURI; gboolean noResponse; guint messageID; - guint maxmsgsize; - guint maxobjsize; + gsize maxmsgsize; + gsize maxobjsize; gchar *emi; }; Modified: trunk/libsyncml/sml_notification.c ============================================================================== --- trunk/libsyncml/sml_notification.c Mon Jul 13 15:21:01 2009 (r1199) +++ trunk/libsyncml/sml_notification.c Mon Jul 13 15:48:19 2009 (r1200) @@ -640,7 +640,7 @@ SmlTransportData *tspdata = NULL; char *data = NULL; - unsigned int size = 0; + gsize size = 0; if (!smlNotificationAssemble(san, &data, &size, error)) goto error; Modified: trunk/libsyncml/sml_parse.c ============================================================================== --- trunk/libsyncml/sml_parse.c Mon Jul 13 15:21:01 2009 (r1199) +++ trunk/libsyncml/sml_parse.c Mon Jul 13 15:48:19 2009 (r1200) @@ -174,7 +174,7 @@ /* assemble a SyncML 1.1 notification */ char *xmlData = NULL; - unsigned int xmlSize = 0; + gsize xmlSize = 0; if (!smlNotificationAssemble11(san, &xmlData, &xmlSize, SML_VERSION_12, error)) { smlNotificationFree(san); Modified: trunk/libsyncml/sml_session.c ============================================================================== --- trunk/libsyncml/sml_session.c Mon Jul 13 15:21:01 2009 (r1199) +++ trunk/libsyncml/sml_session.c Mon Jul 13 15:48:19 2009 (r1200) @@ -109,7 +109,7 @@ smlAssert(session->dataCallback); char *data = NULL; - unsigned int size = 0; + gsize size = 0; gboolean end = FALSE; /* Add the latest header */ @@ -239,7 +239,7 @@ SmlCommand *frag_cmd = NULL; char *data = NULL; - unsigned int size = 0; + gsize size = 0; SmlItem *orig_item = g_list_nth_data(orig_cmd->private.change.items, 0); if (!smlItemGetData(orig_item, &data, &size, error)) goto error; @@ -381,7 +381,7 @@ smlAssert(g_list_length(cmd->private.change.items) == 1); char *data = NULL; - unsigned int size = 0; + gsize size = 0; SmlItem *item = g_list_nth_data(cmd->private.change.items, 0); if (!smlItemGetData(item, &data, &size, error)) goto error; @@ -1287,7 +1287,7 @@ * This is a chunk of the previous item in the buffer. */ char *data = NULL; - unsigned int size = 0; + gsize size = 0; SmlItem *item = g_list_nth_data(cmd->private.change.items, 0); if (!item) goto error; Modified: trunk/tests/check_data_sync_api.c ============================================================================== --- trunk/tests/check_data_sync_api.c Mon Jul 13 15:21:01 2009 (r1199) +++ trunk/tests/check_data_sync_api.c Mon Jul 13 15:48:19 2009 (r1200) @@ -148,7 +148,7 @@ SmlChangeType type, const char *uid, char *data, - unsigned int size, + gsize size, void *userdata, GError **error) { Modified: trunk/tests/check_ds.c ============================================================================== --- trunk/tests/check_ds.c Mon Jul 13 15:21:01 2009 (r1199) +++ trunk/tests/check_ds.c Mon Jul 13 15:48:19 2009 (r1200) @@ -258,7 +258,7 @@ return TRUE; } -static void _recv_sync(SmlDsSession *dsession, unsigned int numChanges, void *userdata) +static void _recv_sync(SmlDsSession *dsession, gsize numChanges, void *userdata) { smlTrace(TRACE_ENTRY, "%s(%p, %d, %p)", __func__,dsession, numChanges, userdata); @@ -267,7 +267,7 @@ smlTrace(TRACE_EXIT, "%s", __func__); } -static gboolean _recv_changes(SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, unsigned int size, const char *contenttype, void *userdata, GError **error) +static gboolean _recv_changes(SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, gsize size, const char *contenttype, void *userdata, GError **error) { smlTrace(TRACE_ENTRY, "%s(%p, %i, %s, %s, %i, %s, %p, %p)", __func__, dsession, type, VA_STRING(uid), VA_STRING(data), size, VA_STRING(contenttype), userdata, error); Modified: trunk/tests/check_san.c ============================================================================== --- trunk/tests/check_san.c Mon Jul 13 15:21:01 2009 (r1199) +++ trunk/tests/check_san.c Mon Jul 13 15:48:19 2009 (r1200) @@ -89,7 +89,7 @@ 0x00}; // num syncs + future char *buffer = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlNotificationAssemble(san, &buffer, &size, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -122,7 +122,7 @@ 0x00}; // num syncs + future char *buffer = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlNotificationAssemble(san, &buffer, &size, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -161,7 +161,7 @@ 0x04, 0x74, 0x74, 0x74, 0x74}; //Server URI; char *buffer = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlNotificationAssemble(san, &buffer, &size, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -206,7 +206,7 @@ 0x04, 0x74, 0x74, 0x74, 0x74}; //Server URI; char *buffer = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlNotificationAssemble(san, &buffer, &size, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -250,7 +250,7 @@ 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x73}; //Server URI; char *buffer = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlNotificationAssemble(san, &buffer, &size, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -277,7 +277,7 @@ sml_fail_unless(error == NULL, NULL); char *buffer = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlNotificationAssemble(san, &buffer, &size, &error), NULL); sml_fail_unless(error == NULL, NULL); smlNotificationFree(san); @@ -544,7 +544,7 @@ sml_fail_unless(error == NULL, NULL); char *buffer = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlNotificationAssemble(san, &buffer, &size, &error), NULL); sml_fail_unless(error == NULL, NULL); Modified: trunk/tests/check_session.c ============================================================================== --- trunk/tests/check_session.c Mon Jul 13 15:21:01 2009 (r1199) +++ trunk/tests/check_session.c Mon Jul 13 15:48:19 2009 (r1200) @@ -390,7 +390,7 @@ smlAssert(smlItemCheck(item)); char *data = NULL; - unsigned int size = 0; + gsize size = 0; smlAssert(smlItemGetData(item, &data, &size, &locerror)); smlAssert(size == 8); @@ -405,7 +405,7 @@ smlAssert(smlItemCheck(item)); char *data = NULL; - unsigned int size = 0; + gsize size = 0; smlAssert(smlItemGetData(item, &data, &size, &locerror)); smlAssert(size == 20); @@ -420,7 +420,7 @@ smlAssert(smlItemCheck(item)); char *data = NULL; - unsigned int size = 0; + gsize size = 0; smlAssert(smlItemGetData(item, &data, &size, &locerror)); if (size != 4) { @@ -2534,7 +2534,7 @@ sml_fail_unless(error == NULL, NULL); char *buffer = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlNotificationAssemble(san, &buffer, &size, &error), NULL); sml_fail_unless(error == NULL, NULL); smlNotificationFree(san); Modified: trunk/tests/check_sync.c ============================================================================== --- trunk/tests/check_sync.c Mon Jul 13 15:21:01 2009 (r1199) +++ trunk/tests/check_sync.c Mon Jul 13 15:48:19 2009 (r1200) @@ -277,7 +277,7 @@ return SML_NO_ERROR; } -static void _recv_sync(SmlDsSession *dsession, unsigned int numChanges, void *userdata) +static void _recv_sync(SmlDsSession *dsession, gsize numChanges, void *userdata) { smlTrace(TRACE_ENTRY, "%s(%p, %d, %p)", __func__, dsession, numChanges, userdata); @@ -287,7 +287,7 @@ smlTrace(TRACE_EXIT, "%s", __func__); } -static gboolean _recv_changes(SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, unsigned int size, const char *contenttype, void *userdata, GError **error) +static gboolean _recv_changes(SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, gsize size, const char *contenttype, void *userdata, GError **error) { smlTrace(TRACE_ENTRY, "%s(%p, %i, %s, %s, %i, %s, %p, %p)", __func__, dsession, type, VA_STRING(uid), VA_STRING(data), size, VA_STRING(contenttype), userdata, error); Modified: trunk/tests/check_wbxml_assembler.c ============================================================================== --- trunk/tests/check_wbxml_assembler.c Mon Jul 13 15:21:01 2009 (r1199) +++ trunk/tests/check_wbxml_assembler.c Mon Jul 13 15:48:19 2009 (r1200) @@ -63,7 +63,7 @@ sml_fail_unless(assm != NULL, NULL); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); SML_ERROR_FREE(error); @@ -103,7 +103,7 @@ sml_fail_unless(error == NULL, NULL); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); SML_ERROR_FREE(error); @@ -155,7 +155,7 @@ smlStatusUnref(status); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -210,7 +210,7 @@ smlCommandUnref(cmd); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -283,7 +283,7 @@ sml_fail_unless(error == NULL, NULL); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -389,7 +389,7 @@ sml_fail_unless(error == NULL, NULL); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -449,7 +449,7 @@ sml_fail_unless(error == NULL, NULL); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -588,7 +588,7 @@ smlCommandUnref(cmd3); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -630,7 +630,7 @@ SML_ERROR_FREE(error); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); SML_ERROR_FREE(error); @@ -663,7 +663,7 @@ SML_ERROR_FREE(error); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); SML_ERROR_FREE(error); @@ -707,7 +707,7 @@ smlStatusUnref(status); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); SML_ERROR_FREE(error); @@ -751,7 +751,7 @@ smlStatusUnref(status); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error == NULL, NULL); smlSafeCFree(&data); @@ -804,7 +804,7 @@ sml_fail_unless(error == NULL, NULL); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -909,7 +909,7 @@ sml_fail_unless(error == NULL, NULL); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); Modified: trunk/tests/check_wbxml_parser.c ============================================================================== --- trunk/tests/check_wbxml_parser.c Mon Jul 13 15:21:01 2009 (r1199) +++ trunk/tests/check_wbxml_parser.c Mon Jul 13 15:48:19 2009 (r1200) @@ -41,7 +41,7 @@ #ifdef ENABLE_WBXML char *buffer = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlWbxmlConvertTo(NULL, data, &buffer, &size, &error), NULL); if (!smlParserStart(parser, buffer, size, &error)) { Modified: trunk/tests/check_xml_assembler.c ============================================================================== --- trunk/tests/check_xml_assembler.c Mon Jul 13 15:21:01 2009 (r1199) +++ trunk/tests/check_xml_assembler.c Mon Jul 13 15:48:19 2009 (r1200) @@ -60,7 +60,7 @@ sml_fail_unless(assm != NULL, NULL); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); SML_ERROR_FREE(error); @@ -100,7 +100,7 @@ sml_fail_unless(error == NULL, NULL); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); SML_ERROR_FREE(error); @@ -152,7 +152,7 @@ smlStatusUnref(status); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -208,7 +208,7 @@ sml_fail_unless(error == NULL, NULL); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -277,7 +277,7 @@ sml_fail_unless(error == NULL, NULL); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -390,7 +390,7 @@ sml_fail_unless(error == NULL, NULL); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -452,7 +452,7 @@ sml_fail_unless(error == NULL, NULL); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -615,7 +615,7 @@ sml_fail_unless(error == NULL, NULL); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -659,7 +659,7 @@ SML_ERROR_FREE(error); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); SML_ERROR_FREE(error); @@ -693,7 +693,7 @@ SML_ERROR_FREE(error); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); SML_ERROR_FREE(error); @@ -738,7 +738,7 @@ smlStatusUnref(status); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); SML_ERROR_FREE(error); @@ -783,7 +783,7 @@ smlStatusUnref(status); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -837,7 +837,7 @@ sml_fail_unless(error == NULL, NULL); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -925,7 +925,7 @@ sml_fail_unless(error == NULL, NULL); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -998,7 +998,7 @@ sml_fail_unless(error == NULL, NULL); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -1071,7 +1071,7 @@ smlStatusUnref(status); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -1176,7 +1176,7 @@ sml_fail_unless(error == NULL, NULL); char *data = NULL; - unsigned int size = 0; + gsize size = 0; /* Must fail since nothing has been added at all */ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL); sml_fail_unless(error != NULL, NULL); @@ -1346,7 +1346,7 @@ sml_fail_unless(error == NULL, NULL); char *data = NULL; - unsigned int size = 0; + gsize size = 0; /* Must fail since nothing has been added at all */ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL); sml_fail_unless(error != NULL, NULL); @@ -1473,7 +1473,7 @@ } char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -1531,7 +1531,7 @@ SmlAssemblerResult res = smlAssemblerAddStatus(assm, status, &error); if (res == SML_ASSEMBLER_RESULT_MISMATCH) { char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -1560,7 +1560,7 @@ if (res == SML_ASSEMBLER_RESULT_MISMATCH) { char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -1584,7 +1584,7 @@ } char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -1661,7 +1661,7 @@ } char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); @@ -1758,7 +1758,7 @@ sml_fail_unless(error == NULL, NULL); char *data = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(data != NULL, NULL); Modified: trunk/tests/check_xml_parser.c ============================================================================== --- trunk/tests/check_xml_parser.c Mon Jul 13 15:21:01 2009 (r1199) +++ trunk/tests/check_xml_parser.c Mon Jul 13 15:48:19 2009 (r1200) @@ -1209,7 +1209,7 @@ sml_fail_unless(cmd->size == 10, NULL); char *data2 = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlItemGetData(item, &data2, &size, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -1268,7 +1268,7 @@ sml_fail_unless(cmd->private.access.item != NULL, NULL); char *buffer = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlItemGetData(cmd->private.access.item, &buffer, &size, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -1328,7 +1328,7 @@ sml_fail_unless(cmd->private.access.item != NULL, NULL); char *buffer = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlItemGetData(cmd->private.access.item, &buffer, &size, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -1385,7 +1385,7 @@ sml_fail_unless(cmd->private.access.item != NULL, NULL); char *buffer = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlItemGetData(cmd->private.access.item, &buffer, &size, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -1451,7 +1451,7 @@ sml_fail_unless(cmd->private.access.item != NULL, NULL); char *buffer = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlItemGetData(cmd->private.access.item, &buffer, &size, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -1614,7 +1614,7 @@ sml_fail_unless(cmd->private.access.item != NULL, NULL); char *buffer = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlItemGetData(cmd->private.access.item, &buffer, &size, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -1682,7 +1682,7 @@ sml_fail_unless(cmd->private.access.item != NULL, NULL); char *buffer = NULL; - unsigned int size = 0; + gsize size = 0; sml_fail_unless(smlItemGetData(cmd->private.access.item, &buffer, &size, &error), NULL); sml_fail_unless(error == NULL, NULL); Modified: trunk/tools/syncml-ds-tool.c ============================================================================== --- trunk/tools/syncml-ds-tool.c Mon Jul 13 15:21:01 2009 (r1199) +++ trunk/tools/syncml-ds-tool.c Mon Jul 13 15:48:19 2009 (r1200) @@ -536,7 +536,7 @@ SmlChangeType type, const char *uid, char *data, - unsigned int size, + gsize size, void *userdata, GError **error) { |
|
From: <svn...@op...> - 2009-07-13 13:21:08
|
Author: bellmich Date: Mon Jul 13 15:21:01 2009 New Revision: 1199 URL: http://libsyncml.opensync.org/changeset/1199 Log: fixed wrong error handling in check_san Modified: trunk/tests/check_san.c Modified: trunk/tests/check_san.c ============================================================================== --- trunk/tests/check_san.c Mon Jul 13 15:20:46 2009 (r1198) +++ trunk/tests/check_san.c Mon Jul 13 15:21:01 2009 (r1199) @@ -36,12 +36,12 @@ GError *error = NULL; _tsp = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); - sml_fail_unless(_tsp != NULL, "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(_tsp != NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); SmlManager *manager = smlManagerNew(_tsp, &error); - sml_fail_unless(manager != NULL, "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(manager != NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlManagerSetLocalMaxMsgSize(manager, defaultMaxMsgSize); smlManagerSetLocalMaxObjSize(manager, defaultMaxObjSize); |
|
From: <svn...@op...> - 2009-07-13 13:20:52
|
Author: bellmich Date: Mon Jul 13 15:20:46 2009 New Revision: 1198 URL: http://libsyncml.opensync.org/changeset/1198 Log: fixed wrong format expression Modified: trunk/libsyncml/sml_manager.c Modified: trunk/libsyncml/sml_manager.c ============================================================================== --- trunk/libsyncml/sml_manager.c Mon Jul 13 15:14:41 2009 (r1197) +++ trunk/libsyncml/sml_manager.c Mon Jul 13 15:20:46 2009 (r1198) @@ -826,7 +826,7 @@ if (smlSessionGetSessionID(session)) { //Check if sessionID exists - smlTrace(TRACE_INTERNAL, "Checking if session ID %s already exists", smlSessionGetSessionID(session)); + smlTrace(TRACE_INTERNAL, "Checking if session ID %d already exists", smlSessionGetSessionID(session)); if (smlManagerSessionFind(manager, smlSessionGetSessionID(session))) { g_set_error(error, SML_ERROR, SML_ERROR_GENERIC, "Session ID already exists"); |
|
From: <svn...@op...> - 2009-07-13 13:14:49
|
Author: bellmich Date: Mon Jul 13 15:14:41 2009 New Revision: 1197 URL: http://libsyncml.opensync.org/changeset/1197 Log: fixed compiler warnings (which were real errors) Modified: trunk/libsyncml/sml_error.c trunk/tools/syncml-ds-tool.c Modified: trunk/libsyncml/sml_error.c ============================================================================== --- trunk/libsyncml/sml_error.c Mon Jul 13 15:06:24 2009 (r1196) +++ trunk/libsyncml/sml_error.c Mon Jul 13 15:14:41 2009 (r1197) @@ -270,6 +270,7 @@ * @returns TRUE if the error is set, FALSE otherwise * */ +/* static gboolean smlErrorIsSet(GError **error) { if (!error) @@ -280,6 +281,7 @@ return TRUE; } +*/ /*! @brief Returns the type of the error * Modified: trunk/tools/syncml-ds-tool.c ============================================================================== --- trunk/tools/syncml-ds-tool.c Mon Jul 13 15:06:24 2009 (r1196) +++ trunk/tools/syncml-ds-tool.c Mon Jul 13 15:14:41 2009 (r1197) @@ -315,7 +315,7 @@ if (fdata.st_mtime >= checkpoint) { if (sessionType == SML_SESSION_TYPE_CLIENT) { g_set_error(error, TOOL_ERROR, SML_ERROR_GENERIC, - "Someone accessed the file absolute after the synchronization started.", + "Someone accessed the file %s after the synchronization started.", filename); goto error; } else { |
|
From: <svn...@op...> - 2009-07-13 13:06:31
|
Author: bellmich Date: Mon Jul 13 15:06:24 2009 New Revision: 1196 URL: http://libsyncml.opensync.org/changeset/1196 Log: fixed wrong error handling in sync tests Modified: trunk/tests/check_sync.c Modified: trunk/tests/check_sync.c ============================================================================== --- trunk/tests/check_sync.c Mon Jul 13 15:04:42 2009 (r1195) +++ trunk/tests/check_sync.c Mon Jul 13 15:06:24 2009 (r1196) @@ -114,7 +114,7 @@ g_atomic_int_inc(&num_disconnects); break; case SML_MANAGER_TRANSPORT_ERROR: - smlTrace(TRACE_INTERNAL, "%s - error: %s", __func__, error->message); + smlTrace(TRACE_INTERNAL, "%s - error: %s", __func__, GET_ERROR_MESSAGE(error)); eventError = g_error_copy(error); transport_errors++; break; @@ -132,7 +132,7 @@ break; case SML_MANAGER_SESSION_ERROR: case SML_MANAGER_SESSION_WARNING: - smlTrace(TRACE_INTERNAL, "%s - error: %s", __func__, error->message); + smlTrace(TRACE_INTERNAL, "%s - error: %s", __func__, GET_ERROR_MESSAGE(error)); if (eventError) SML_ERROR_FREE(eventError); eventError = g_error_copy(error); @@ -340,9 +340,9 @@ smlManagerSetLocalMaxMsgSize(servertracker->manager, TEST_DEFAULT_MAX_MSG_SIZE); smlManagerSetLocalMaxObjSize(servertracker->manager, TEST_DEFAULT_MAX_OBJ_SIZE); - sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -415,7 +415,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } smlDsSessionGetAlert(servertracker->dssessions[0], _recv_alert, GINT_TO_POINTER(1)); @@ -433,7 +433,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } sml_fail_unless(init_alerts_received == 3, NULL); @@ -488,7 +488,7 @@ smlAuthFree(auth2); sml_fail_unless(smlTransportFinalize(server, &error), NULL); - sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportFinalize(client, &error), "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(server); smlTransportFree(client); @@ -526,9 +526,9 @@ smlManagerSetLocalMaxMsgSize(servertracker->manager, TEST_DEFAULT_MAX_MSG_SIZE); smlManagerSetLocalMaxObjSize(servertracker->manager, TEST_DEFAULT_MAX_OBJ_SIZE); - sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -600,7 +600,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } smlDsSessionGetAlert(servertracker->dssessions[0], _recv_alert, GINT_TO_POINTER(1)); @@ -630,7 +630,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } const char *content_types[] = {SML_ELEMENT_TEXT_VCARD, SML_ELEMENT_TEXT_VCAL, SML_ELEMENT_TEXT_PLAIN}; @@ -673,7 +673,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } sml_fail_unless(servertracker->session != NULL, NULL); @@ -687,7 +687,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } sml_fail_unless(init_alerts_received == 3, NULL); @@ -742,7 +742,7 @@ smlManagerFree(servermanager); sml_fail_unless(smlTransportFinalize(server, &error), NULL); - sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportFinalize(client, &error), "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(server); smlTransportFree(client); @@ -782,9 +782,9 @@ smlManagerSetLocalMaxMsgSize(servertracker->manager, TEST_DEFAULT_MAX_MSG_SIZE); smlManagerSetLocalMaxObjSize(servertracker->manager, TEST_DEFAULT_MAX_OBJ_SIZE); - sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -856,7 +856,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } smlDsSessionGetAlert(servertracker->dssessions[0], _recv_alert, GINT_TO_POINTER(1)); @@ -886,7 +886,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } const char *content_types[] = {SML_ELEMENT_TEXT_VCARD, SML_ELEMENT_TEXT_VCAL, SML_ELEMENT_TEXT_PLAIN}; @@ -929,7 +929,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } for (k = 0; k < 3; k++) @@ -970,7 +970,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } unsigned int i = 0; @@ -998,7 +998,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } sml_fail_unless(servertracker->session != NULL, NULL); @@ -1012,7 +1012,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } sml_fail_unless(init_alerts_received == 3, NULL); @@ -1067,7 +1067,7 @@ smlManagerFree(servermanager); sml_fail_unless(smlTransportFinalize(server, &error), NULL); - sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportFinalize(client, &error), "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(server); smlTransportFree(client); @@ -1105,9 +1105,9 @@ smlManagerSetLocalMaxMsgSize(servertracker->manager, TEST_DEFAULT_MAX_MSG_SIZE); smlManagerSetLocalMaxObjSize(servertracker->manager, TEST_DEFAULT_MAX_OBJ_SIZE); - sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -1261,7 +1261,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } sml_fail_unless(smlSessionGetRemoteMaxMsgSize(servertracker->session) == TEST_DEFAULT_MAX_MSG_SIZE, NULL); @@ -1278,7 +1278,7 @@ smlDsSessionDispatch(servertracker->dssessions[1]); smlDsSessionDispatch(servertracker->dssessions[2]); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } SmlDevInf *recvClientDevInf = smlDevInfAgentGetSessionDevInf(serveragent, servertracker->session); @@ -1288,8 +1288,8 @@ sml_fail_unless(sml_dev_inf_get_support_large_objs(recvClientDevInf) == FALSE, NULL); sml_fail_unless(sml_dev_inf_get_support_utc(recvClientDevInf) == FALSE, NULL); - sml_fail_unless(smlDevInfAgentSendDevInf(serveragent, servertracker->session, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlDevInfAgentSendDevInf(serveragent, servertracker->session, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlDsSessionSendAlert(servertracker->dssessions[0], SML_ALERT_TWO_WAY, "last", "next", _alert_reply, GINT_TO_POINTER(1), &error); smlDsSessionSendAlert(servertracker->dssessions[1], SML_ALERT_TWO_WAY, "last", "next", _alert_reply, GINT_TO_POINTER(1), &error); @@ -1314,7 +1314,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } sml_fail_unless(smlSessionGetRemoteMaxMsgSize(clienttracker->session) == TEST_DEFAULT_MAX_MSG_SIZE, NULL); @@ -1367,7 +1367,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } for (k = 0; k < 3; k++) @@ -1408,7 +1408,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } unsigned int i = 0; @@ -1436,7 +1436,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } @@ -1457,7 +1457,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } sml_fail_unless(init_alerts_received == 3, NULL); @@ -1513,7 +1513,7 @@ smlManagerFree(servermanager); sml_fail_unless(smlTransportFinalize(server, &error), NULL); - sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportFinalize(client, &error), "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(server); smlTransportFree(client); @@ -1538,13 +1538,13 @@ /* The OMA DS client is an OBEX server. */ SmlTransport *client = smlTransportNew(SML_TRANSPORT_OBEX_SERVER, &error); sml_fail_unless(smlTransportSetConnectionType(client, SML_TRANSPORT_CONNECTION_TYPE_NET, &error), NULL); - sml_fail_unless(smlTransportSetConfigOption(client, "PORT", "12010", &error), "%s", error->message); + sml_fail_unless(smlTransportSetConfigOption(client, "PORT", "12010", &error), "%s", GET_ERROR_MESSAGE(error)); /* The OMA DS server is an OBEX client. */ SmlTransport *server = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error); - sml_fail_unless(smlTransportSetConnectionType(server, SML_TRANSPORT_CONNECTION_TYPE_NET, &error), "%s", error->message); - sml_fail_unless(smlTransportSetConfigOption(server, "PORT", "12010", &error), "%s", error->message); - sml_fail_unless(smlTransportSetConfigOption(server, "URL", "127.0.0.1", &error), "%s", error->message); + sml_fail_unless(smlTransportSetConnectionType(server, SML_TRANSPORT_CONNECTION_TYPE_NET, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportSetConfigOption(server, "PORT", "12010", &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportSetConfigOption(server, "URL", "127.0.0.1", &error), "%s", GET_ERROR_MESSAGE(error)); managerTracker *clienttracker = g_malloc0(sizeof(managerTracker)); SmlManager *clientmanager = clienttracker->manager = smlManagerNew(client, &error); @@ -1560,8 +1560,8 @@ sml_fail_unless(smlManagerStart(servermanager, &error), NULL); sml_fail_unless(error == NULL, NULL); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); SmlLocation *loc = sml_location_new_with_options("test", NULL, &gerror); sml_fail_unless(loc != NULL, NULL); @@ -1637,7 +1637,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } sml_fail_unless(clienttracker->session != NULL, NULL); @@ -1655,7 +1655,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } smlDsSessionGetAlert(servertracker->dssessions[0], _recv_alert, GINT_TO_POINTER(1)); @@ -1685,7 +1685,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } const char *content_types[] = {SML_ELEMENT_TEXT_VCARD, SML_ELEMENT_TEXT_VCAL, SML_ELEMENT_TEXT_PLAIN}; @@ -1728,7 +1728,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } sml_fail_unless(servertracker->session != NULL, NULL); @@ -1741,7 +1741,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } sml_fail_unless(init_alerts_received == 3, NULL); @@ -1799,7 +1799,7 @@ smlManagerFree(clientmanager); smlManagerFree(servermanager); - sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportFinalize(server, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportFinalize(client, &error), NULL); smlTransportFree(server); @@ -1840,13 +1840,13 @@ smlManagerSetLocalMaxMsgSize(servertracker->manager, TEST_DEFAULT_MAX_MSG_SIZE); smlManagerSetLocalMaxObjSize(servertracker->manager, TEST_DEFAULT_MAX_OBJ_SIZE); - sml_fail_unless(smlManagerStart(clientmanager, &error), "%s", error->message); + sml_fail_unless(smlManagerStart(clientmanager, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(error == NULL, NULL); - sml_fail_unless(smlManagerStart(servermanager, &error), "%s", error->message); + sml_fail_unless(smlManagerStart(servermanager, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(error == NULL, NULL); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); SmlLocation *loc1 = sml_location_new_with_options("test1", NULL, &gerror); sml_fail_unless(loc1 != NULL, NULL); @@ -1909,8 +1909,8 @@ sml_fail_unless(smlDsServerAddSan(servertracker->ds[2], san, &error), NULL); sml_fail_unless(error == NULL, NULL); - sml_fail_unless(smlNotificationSend(san, server, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlNotificationSend(san, server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlNotificationFree(san); @@ -1918,7 +1918,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } sml_fail_unless(clienttracker->session != NULL, NULL); @@ -1934,7 +1934,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } smlDsSessionGetAlert(servertracker->dssessions[0], _recv_alert, GINT_TO_POINTER(1)); @@ -1964,7 +1964,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } const char *content_types[] = {SML_ELEMENT_TEXT_VCARD, SML_ELEMENT_TEXT_VCAL, SML_ELEMENT_TEXT_PLAIN}; @@ -1986,7 +1986,7 @@ smlDsSessionCloseSync(clienttracker->dssessions[k], &error); } - sml_fail_unless(smlSessionFlush(clienttracker->session, TRUE, &error), "%s", error->message); + sml_fail_unless(smlSessionFlush(clienttracker->session, TRUE, &error), "%s", GET_ERROR_MESSAGE(error)); smlDsSessionGetSync(servertracker->dssessions[0], _recv_sync, GINT_TO_POINTER(1)); smlDsSessionGetSync(servertracker->dssessions[1], _recv_sync, GINT_TO_POINTER(1)); @@ -2007,11 +2007,11 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } sml_fail_unless(servertracker->session != NULL, NULL); - sml_fail_unless(smlSessionEnd(servertracker->session, &error), "%s", error->message); + sml_fail_unless(smlSessionEnd(servertracker->session, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(error == NULL, NULL); smlSessionUnref(servertracker->session); smlSessionUnref(clienttracker->session); @@ -2020,7 +2020,7 @@ smlManagerDispatch(servermanager); smlManagerDispatch(clientmanager); usleep(100); - sml_fail_unless(eventError == NULL, "%s", eventError->message); + sml_fail_unless(eventError == NULL, "%s", GET_ERROR_MESSAGE(eventError)); } sml_fail_unless(init_alerts_received == 3, NULL); @@ -2078,8 +2078,8 @@ smlManagerFree(clientmanager); smlManagerFree(servermanager); - sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message); - sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportFinalize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportFinalize(client, &error), "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(server); smlTransportFree(client); |
|
From: <svn...@op...> - 2009-07-13 13:04:50
|
Author: bellmich Date: Mon Jul 13 15:04:42 2009 New Revision: 1195 URL: http://libsyncml.opensync.org/changeset/1195 Log: fixed wrong error handling of devinf tests Modified: trunk/tests/check_devinf.c Modified: trunk/tests/check_devinf.c ============================================================================== --- trunk/tests/check_devinf.c Mon Jul 13 15:03:15 2009 (r1194) +++ trunk/tests/check_devinf.c Mon Jul 13 15:04:42 2009 (r1195) @@ -113,8 +113,8 @@ smlManagerSetLocalMaxMsgSize(servermanager, defaultMaxMsgSize); smlManagerSetLocalMaxObjSize(servermanager, defaultMaxObjSize); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -197,8 +197,8 @@ smlSafeFree((gpointer *)&clienttracker); smlSafeFree((gpointer *)&servertracker); - sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message); - sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportFinalize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportFinalize(client, &error), "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(server); smlTransportFree(client); @@ -242,8 +242,8 @@ smlManagerSetLocalMaxMsgSize(servermanager, defaultMaxMsgSize); smlManagerSetLocalMaxObjSize(servermanager, defaultMaxObjSize); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -382,8 +382,8 @@ smlManagerFree(clientmanager); smlManagerFree(servermanager); - sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message); - sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportFinalize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportFinalize(client, &error), "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(server); smlTransportFree(client); |
|
From: <svn...@op...> - 2009-07-13 13:03:23
|
Author: bellmich Date: Mon Jul 13 15:03:15 2009 New Revision: 1194 URL: http://libsyncml.opensync.org/changeset/1194 Log: fixed wrong error handling in mobile tests Modified: trunk/tests/mobiles/libsyncml_ds_server.c trunk/tests/mobiles/obex_mobile_ds_client.c Modified: trunk/tests/mobiles/libsyncml_ds_server.c ============================================================================== --- trunk/tests/mobiles/libsyncml_ds_server.c Mon Jul 13 15:01:30 2009 (r1193) +++ trunk/tests/mobiles/libsyncml_ds_server.c Mon Jul 13 15:03:15 2009 (r1194) @@ -52,7 +52,7 @@ switch (type) { case SML_DATA_SYNC_EVENT_ERROR: - sml_fail_unless(FALSE, "%s", error->message); + sml_fail_unless(FALSE, "%s", GET_ERROR_MESSAGE(error)); smlAssert(FALSE); break; case SML_DATA_SYNC_EVENT_CONNECT: @@ -66,7 +66,7 @@ case SML_DATA_SYNC_EVENT_GOT_ALL_CHANGES: sml_fail_unless( smlDataSyncSendChanges(dsObject, &locerror), - "%s", locerror->message); + "%s", GET_ERROR_MESSAGE(locerror)); break; default: sml_fail_unless(FALSE, "The unexpected data sync event %d was received.", type); @@ -100,7 +100,7 @@ SML_SESSION_TYPE_SERVER, tspType, &error); - sml_fail_unless(dsObject != NULL, "%s", error->message); + sml_fail_unless(dsObject != NULL, "%s", GET_ERROR_MESSAGE(error)); switch(tspType) { @@ -111,13 +111,13 @@ SML_DATA_SYNC_CONFIG_CONNECTION_TYPE, SML_DATA_SYNC_CONFIG_CONNECTION_NET, &error), - "%s", error->message); + "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless( smlDataSyncSetOption( dsObject, SML_TRANSPORT_CONFIG_PORT, obex_port, &error), - "%s", error->message); + "%s", GET_ERROR_MESSAGE(error)); break; default: sml_fail_unless(FALSE, "The unsupported transport type %d was used for testing.", tspType); @@ -128,43 +128,43 @@ dsObject, SML_TRANSPORT_CONFIG_URL, "127.0.0.1", &error), - "%s", error->message); + "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless( smlDataSyncSetOption( dsObject, SML_DATA_SYNC_CONFIG_MAX_MSG_SIZE, maxMsgSize, &error), - "%s", error->message); + "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless( smlDataSyncSetOption( dsObject, SML_DATA_SYNC_CONFIG_MAX_OBJ_SIZE, maxObjSize, &error), - "%s", error->message); + "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless( smlDataSyncSetOption( dsObject, SML_DATA_SYNC_CONFIG_USE_WBXML, enableWbxml, &error), - "%s", error->message); + "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless( smlDataSyncSetOption( dsObject, SML_DATA_SYNC_CONFIG_IDENTIFIER, identifier, &error), - "%s", error->message); + "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless( smlDataSyncSetOption( dsObject, SML_DATA_SYNC_CONFIG_USE_TIMESTAMP_ANCHOR, useTimestamp, &error), - "%s", error->message); + "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless( smlDataSyncSetOption( dsObject, SML_DATA_SYNC_CONFIG_VERSION, "1.1", &error), - "%s", error->message); + "%s", GET_ERROR_MESSAGE(error)); smlDataSyncRegisterEventCallback(dsObject, _libsyncml_event_callback, NULL); smlDataSyncRegisterChangeCallback(dsObject, _recv_change, NULL); @@ -179,14 +179,14 @@ NULL, locList[2*i], /* source */ &error), - "%s", error->message); + "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(error == NULL, NULL); } - sml_fail_unless(smlDataSyncInit(dsObject, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlDataSyncRun(dsObject, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlDataSyncInit(dsObject, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlDataSyncRun(dsObject, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); } void libsyncml_disconnect() Modified: trunk/tests/mobiles/obex_mobile_ds_client.c ============================================================================== --- trunk/tests/mobiles/obex_mobile_ds_client.c Mon Jul 13 15:01:30 2009 (r1193) +++ trunk/tests/mobiles/obex_mobile_ds_client.c Mon Jul 13 15:03:15 2009 (r1194) @@ -80,14 +80,14 @@ mimetype = SML_MIMETYPE_WBXML; char *msg = smlTryMalloc0(size, &error); - sml_fail_unless(msg != NULL, "%s", error->message); + sml_fail_unless(msg != NULL, "%s", GET_ERROR_MESSAGE(error)); memcpy(msg, data, size); SmlTransportData *tsp_data = smlTransportDataNew(msg, size, mimetype, TRUE, &error); sml_fail_unless(tsp_data != NULL, NULL); sml_fail_unless(error == NULL, NULL); - sml_fail_unless(smlTransportSend(mobile_tsp, link_, tsp_data, &error), "%s", error->message); + sml_fail_unless(smlTransportSend(mobile_tsp, link_, tsp_data, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(error == NULL, NULL); smlTransportDataDeref(tsp_data); @@ -317,7 +317,7 @@ mobile_state = TEST_MOBILE_STATE_DISCONNECTED; break; case SML_TRANSPORT_EVENT_ERROR: - sml_fail_unless(FALSE, "%s", error->message); + sml_fail_unless(FALSE, "%s", GET_ERROR_MESSAGE(error)); break; default: sml_fail_unless(FALSE, "The unexpected transport event %d was received.", type); |
|
From: <svn...@op...> - 2009-07-13 13:01:37
|
Author: bellmich Date: Mon Jul 13 15:01:30 2009 New Revision: 1193 URL: http://libsyncml.opensync.org/changeset/1193 Log: fixed wrong error handling in manager tests Modified: trunk/tests/check_manager.c Modified: trunk/tests/check_manager.c ============================================================================== --- trunk/tests/check_manager.c Mon Jul 13 15:00:48 2009 (r1192) +++ trunk/tests/check_manager.c Mon Jul 13 15:01:30 2009 (r1193) @@ -171,7 +171,7 @@ return; error: - smlTrace(TRACE_EXIT_ERROR, "%s - %s", __func__, error->message); + smlTrace(TRACE_EXIT_ERROR, "%s - %s", __func__, GET_ERROR_MESSAGE(error)); SML_ERROR_FREE(error); return; } @@ -195,8 +195,8 @@ SmlManager *servermanager = servertracker->manager = smlManagerNew(server, &error); smlManagerSetEventCallback(servertracker->manager, _manager_event, servertracker); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -242,7 +242,7 @@ g_free(servertracker); sml_fail_unless(smlTransportFinalize(client, &error), NULL); - sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportFinalize(server, &error), "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(client); smlTransportFree(server); @@ -271,8 +271,8 @@ smlManagerSetLocalMaxObjSize(servertracker->manager, defaultMaxObjSize); smlManagerRegisterHeaderHandler(servermanager, _header_callback, NULL, NULL); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -354,8 +354,8 @@ smlManagerSetLocalMaxObjSize(servertracker->manager, defaultMaxObjSize); smlManagerRegisterHeaderHandler(servermanager, _header_callback, NULL, NULL); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -481,7 +481,7 @@ return; error: - smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, error->message); + smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, GET_ERROR_MESSAGE(error)); if (error) SML_ERROR_FREE(error); } @@ -527,8 +527,8 @@ smlManagerSetLocalMaxMsgSize(servertracker->manager, defaultMaxMsgSize); smlManagerSetLocalMaxObjSize(servertracker->manager, defaultMaxObjSize); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -617,8 +617,8 @@ smlManagerFree(clientmanager); smlManagerFree(servermanager); - sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message); - sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportFinalize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportFinalize(client, &error), "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(server); smlTransportFree(client); @@ -647,8 +647,8 @@ SmlManager *servermanager = servertracker->manager = smlManagerNew(server, &error); smlManagerSetEventCallback(servertracker->manager, _manager_event, servertracker); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); |
|
From: <svn...@op...> - 2009-07-13 13:00:56
|
Author: bellmich Date: Mon Jul 13 15:00:48 2009 New Revision: 1192 URL: http://libsyncml.opensync.org/changeset/1192 Log: fixed wrong error handling in session tests Modified: trunk/tests/check_session.c Modified: trunk/tests/check_session.c ============================================================================== --- trunk/tests/check_session.c Mon Jul 13 14:57:13 2009 (r1191) +++ trunk/tests/check_session.c Mon Jul 13 15:00:48 2009 (r1192) @@ -292,12 +292,12 @@ { GError *error = NULL; _tsp = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); - sml_fail_unless(_tsp != NULL, "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(_tsp != NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); SmlManager *manager = smlManagerNew(_tsp, &error); - sml_fail_unless(manager != NULL, "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(manager != NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlManagerSetLocalMaxMsgSize(manager, defaultMaxMsgSize); smlManagerSetLocalMaxObjSize(manager, defaultMaxObjSize); @@ -317,11 +317,10 @@ init_testbed(); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); sml_fail_unless(session != NULL, NULL); @@ -339,11 +338,10 @@ init_testbed(); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); @@ -462,7 +460,7 @@ if (GPOINTER_TO_INT(userdata) == 2) g_atomic_int_inc(&errors_received); else { - sml_fail_unless(FALSE, "%s", error->message); + sml_fail_unless(FALSE, "%s", GET_ERROR_MESSAGE(error)); abort(); } break; @@ -534,11 +532,10 @@ init_testbed(); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); @@ -576,11 +573,10 @@ init_testbed(); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); @@ -619,11 +615,10 @@ init_testbed(); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); 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>"; @@ -673,11 +668,10 @@ init_testbed(); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); @@ -754,11 +748,10 @@ init_testbed(); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); @@ -833,11 +826,10 @@ init_testbed(); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); @@ -931,11 +923,10 @@ int num_commands = 1000; GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); @@ -998,7 +989,7 @@ sml_fail_unless(end_received == 0, NULL); sml_fail_unless(smlSessionFlush(session, TRUE, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); /*while (finals_received != 3) { usleep(100); @@ -1051,11 +1042,10 @@ mutex = g_mutex_new(); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); @@ -1179,11 +1169,10 @@ mutex = g_mutex_new(); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); @@ -1281,11 +1270,10 @@ setup_testbed(NULL); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); @@ -1400,11 +1388,10 @@ init_testbed(); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); 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>"; @@ -1484,11 +1471,10 @@ init_testbed(); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); 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>"; @@ -1677,11 +1663,10 @@ init_testbed(); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); 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>"; @@ -1728,11 +1713,10 @@ init_testbed(); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); 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>"; @@ -1826,11 +1810,10 @@ init_testbed(); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); 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>"; @@ -1888,11 +1871,10 @@ init_testbed(); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); 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>"; @@ -1944,11 +1926,10 @@ init_testbed(); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); 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>"; @@ -2030,11 +2011,10 @@ init_testbed(); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); 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>9</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData></MoreData></Item></Add></Sync></SyncBody></SyncML>"; @@ -2116,11 +2096,10 @@ init_testbed(); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); 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>7</Size></Meta><Item><Source><LocURI>uid</LocURI></Source><Data><![CDATA[data]]></Data><MoreData></MoreData></Item></Add></Sync></SyncBody></SyncML>"; @@ -2205,11 +2184,10 @@ int objlength = 600; GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); @@ -2290,11 +2268,10 @@ int objlength = 4000; GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); @@ -2367,11 +2344,10 @@ int num_obj = 10; GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); @@ -2447,11 +2423,10 @@ int num_obj = 5; GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); @@ -2531,11 +2506,10 @@ init_testbed(); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlSessionThread *thread1 = smlSessionRunAsync(session, &to_session); @@ -2551,8 +2525,8 @@ smlSessionSetDataCallback(session, _data_send_callback, &to_session2); SmlNotification *san = smlNotificationNew(SML_SAN_VERSION_11, SML_SAN_UIMODE_USER, SML_SAN_INITIATOR_SERVER, 65535, "test", "/", SML_MIMETYPE_XML, &error); - sml_fail_unless(san != NULL, "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(san != NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); SmlManager *manager = _start_manager(); smlNotificationSetManager(san, manager); |
|
From: <svn...@op...> - 2009-07-13 12:57:26
|
Author: bellmich Date: Mon Jul 13 14:57:13 2009 New Revision: 1191 URL: http://libsyncml.opensync.org/changeset/1191 Log: fixed wrong error handling in XML assembler tests Modified: trunk/tests/check_xml_assembler.c Modified: trunk/tests/check_xml_assembler.c ============================================================================== --- trunk/tests/check_xml_assembler.c Mon Jul 13 14:53:05 2009 (r1190) +++ trunk/tests/check_xml_assembler.c Mon Jul 13 14:57:13 2009 (r1191) @@ -44,11 +44,10 @@ { setup_testbed(NULL); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -82,11 +81,10 @@ { setup_testbed(NULL); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -123,11 +121,10 @@ { setup_testbed(NULL); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -179,11 +176,10 @@ { setup_testbed(NULL); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -236,11 +232,10 @@ { setup_testbed(NULL); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -306,11 +301,10 @@ { setup_testbed(NULL); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -420,11 +414,10 @@ { setup_testbed(NULL); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -523,11 +516,10 @@ { setup_testbed(NULL); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -647,11 +639,10 @@ { setup_testbed(NULL); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -682,11 +673,10 @@ { setup_testbed(NULL); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -717,11 +707,10 @@ { setup_testbed(NULL); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -763,11 +752,10 @@ { setup_testbed(NULL); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -810,11 +798,10 @@ { setup_testbed(NULL); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -885,11 +872,10 @@ { setup_testbed(NULL); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -919,9 +905,9 @@ SmlDevInf *devinf = sml_dev_inf_new(); sml_fail_unless(devinf != NULL, NULL); sml_dev_inf_set_dev_typ(devinf, SML_DEVINF_DEVTYP_WORKSTATION); - sml_fail_unless(sml_dev_inf_set_dev_id(devinf, "mydevice", &gerror), "%s", gerror?gerror->message:"No GError set."); + sml_fail_unless(sml_dev_inf_set_dev_id(devinf, "mydevice", &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(devinf != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); SmlCommand *cmd = smlCommandNewDevInfPut(devinf, SML_DEVINF_VERSION_11, &error); sml_fail_unless(cmd != NULL, NULL); @@ -959,11 +945,10 @@ { setup_testbed(NULL); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -993,7 +978,7 @@ SmlDevInf *devinf = sml_dev_inf_new(); sml_fail_unless(devinf != NULL, NULL); sml_dev_inf_set_dev_typ(devinf, SML_DEVINF_DEVTYP_WORKSTATION); - sml_fail_unless(sml_dev_inf_set_dev_id(devinf, "mydevice", &gerror), "%s", gerror?gerror->message:"No GError set."); + sml_fail_unless(sml_dev_inf_set_dev_id(devinf, "mydevice", &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(devinf != NULL, NULL); sml_fail_unless(error == NULL, NULL); @@ -1033,11 +1018,10 @@ { setup_testbed(NULL); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -1097,7 +1081,7 @@ smlSessionUnref(session); 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; @@ -1161,11 +1145,10 @@ { setup_testbed(NULL); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -1229,7 +1212,7 @@ sml_fail_unless(smlAssemblerIsStatusMissing(assm) == TRUE, 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; @@ -1293,7 +1276,7 @@ smlSessionUnref(session); parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", error->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE(error)); header = NULL; sml_fail_unless(smlParserGetHeader(parser, &header, &cred, &error), NULL); @@ -1339,11 +1322,10 @@ { setup_testbed(NULL); GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -1443,11 +1425,10 @@ int num_status = 1000; GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -1522,11 +1503,10 @@ int limit = 50000; GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -1564,7 +1544,7 @@ sml_fail_unless(smlAssemblerAddStatus(assm, status, &error) == SML_ASSEMBLER_RESULT_OK, NULL); sml_fail_unless(error == NULL, NULL); } else if (res != SML_ASSEMBLER_RESULT_OK) { - sml_fail_unless(FALSE, "%s", error->message); + sml_fail_unless(FALSE, "%s", GET_ERROR_MESSAGE(error)); } smlStatusUnref(status); @@ -1594,7 +1574,7 @@ sml_fail_unless(smlAssemblerStartCommand(assm, NULL, cmd1, &error), NULL); sml_fail_unless(error == NULL, NULL); } else if (res != SML_ASSEMBLER_RESULT_OK) { - sml_fail_unless(FALSE, "%s", error->message); + sml_fail_unless(FALSE, "%s", GET_ERROR_MESSAGE(error)); } smlCommandUnref(cmd1); @@ -1634,11 +1614,10 @@ int limit = 500000000; GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. @@ -1709,11 +1688,10 @@ int limit = 500000; GError *error = NULL; - GError *gerror = NULL; - SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); + SmlLocation *loc = sml_location_new_with_options("/test", NULL, &error); sml_fail_unless(loc != NULL, NULL); - sml_fail_unless(gerror == NULL, NULL); + sml_fail_unless(error == NULL, NULL); /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. |
|
From: <svn...@op...> - 2009-07-13 12:53:12
|
Author: bellmich Date: Mon Jul 13 14:53:05 2009 New Revision: 1190 URL: http://libsyncml.opensync.org/changeset/1190 Log: fixed wrong error handling of OBEX tests Modified: trunk/tests/check_obex.c Modified: trunk/tests/check_obex.c ============================================================================== --- trunk/tests/check_obex.c Mon Jul 13 14:51:30 2009 (r1189) +++ trunk/tests/check_obex.c Mon Jul 13 14:53:05 2009 (r1190) @@ -59,7 +59,7 @@ GError *error = NULL; SmlTransport *tsp = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error); sml_fail_unless(tsp != NULL, NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(tsp); } @@ -72,16 +72,16 @@ GError *error = NULL; SmlTransport *tsp = smlTransportNew(SML_TRANSPORT_OBEX_CLIENT, &error); sml_fail_unless(tsp != NULL, NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportSetConfigOption(tsp, "URL", "127.0.0.1", &error), NULL); sml_fail_unless(smlTransportSetConnectionType(tsp, SML_TRANSPORT_CONNECTION_TYPE_NET, &error), NULL); - sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportFinalize(tsp, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(tsp); } @@ -94,7 +94,7 @@ GError *error = NULL; SmlTransport *tsp = smlTransportNew(SML_TRANSPORT_OBEX_SERVER, &error); sml_fail_unless(tsp != NULL, NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(tsp); } @@ -159,9 +159,9 @@ if (GPOINTER_TO_INT(userdata) == 1) { data = smlTransportDataNew((char *)"answer", 7, SML_MIMETYPE_XML, FALSE, &locerror); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(locerror == NULL, "%s", locerror->message); + sml_fail_unless(locerror == NULL, "%s", GET_ERROR_MESSAGE(locerror)); - sml_fail_unless(smlTransportSend(tsp, link_, data, &locerror), "%s", locerror->message); + sml_fail_unless(smlTransportSend(tsp, link_, data, &locerror), "%s", GET_ERROR_MESSAGE(locerror)); smlTransportDataDeref(data); } else if (GPOINTER_TO_INT(userdata) == 2) { @@ -198,7 +198,7 @@ g_atomic_int_inc(&server_disconnect_done); break; case SML_TRANSPORT_EVENT_ERROR: - sml_fail_unless(FALSE, "%s", error->message); + sml_fail_unless(FALSE, "%s", GET_ERROR_MESSAGE(error)); break; default: sml_fail_unless(FALSE, "An unexpected transport event %d was received.", type); @@ -231,10 +231,10 @@ GError *error = NULL; SmlTransport *tsp = smlTransportNew(SML_TRANSPORT_OBEX_SERVER, &error); sml_fail_unless(tsp != NULL, NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportSetConnectionType(tsp, SML_TRANSPORT_CONNECTION_TYPE_NET, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); /* Don't use the default port 650 here because this is a reserved port in Unix. * Therefore the port is usually only allowed for the root user. @@ -243,11 +243,11 @@ smlTransportSetEventCallback(tsp, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); - sml_fail_unless(smlTransportFinalize(tsp, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportFinalize(tsp, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(tsp); } @@ -271,17 +271,17 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportConnect(client, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_connect_done < 1 || server_connect_done < 1) { usleep(50); }; sml_fail_unless(smlTransportDisconnect(client, NULL, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_disconnect_done < 1 || server_disconnect_done < 1) { usleep(50); }; @@ -318,28 +318,28 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(3)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportConnect(client, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_connect_done < 1 || server_connect_done < 1) { usleep(50); }; SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); - sml_fail_unless(smlTransportSend(client, NULL, data, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportSend(client, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); while (server_receives < 1) { usleep(50); }; sml_fail_unless(smlTransportDisconnect(client, NULL, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while ((client_disconnect_done < 1 || server_disconnect_done < 1 @@ -396,26 +396,26 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportConnect(client, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_connect_done < 1 || server_connect_done < 1) { usleep(50); }; SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); - sml_fail_unless(smlTransportSend(client, NULL, data, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportSend(client, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); sml_fail_unless(smlTransportDisconnect(client, NULL, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_disconnect_done < 1 || server_disconnect_done < 1) { usleep(50); }; @@ -455,12 +455,12 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportConnect(client, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_connect_done < 1 || server_connect_done < 1) { usleep(50); }; @@ -470,10 +470,10 @@ for (i = 0; i < num; i++) { data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); - sml_fail_unless(smlTransportSend(client, NULL, data, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportSend(client, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); @@ -485,7 +485,7 @@ } sml_fail_unless(smlTransportDisconnect(client, NULL, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_disconnect_done < 1 || server_disconnect_done < 1) { usleep(50); }; @@ -535,44 +535,44 @@ smlTransportSetEventCallback(client3, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client1, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(client2, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(client3, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(client1, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client2, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client3, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportConnect(client1, &error), NULL); sml_fail_unless(smlTransportConnect(client2, &error), NULL); sml_fail_unless(smlTransportConnect(client3, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_connect_done < 3 || server_connect_done < 3) { usleep(50); }; SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportSend(client2, NULL, data, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportSend(client2, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportSend(client3, NULL, data, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportSend(client3, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); sml_fail_unless(smlTransportDisconnect(client1, NULL, &error), NULL); sml_fail_unless(smlTransportDisconnect(client2, NULL, &error), NULL); sml_fail_unless(smlTransportDisconnect(client3, NULL, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_disconnect_done < 3 || server_disconnect_done < 3) { usleep(50); }; @@ -629,20 +629,20 @@ smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); /* Always start the server first. */ - sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportInitialize(client1, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportInitialize(client2, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportInitialize(client3, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client1, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client2, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client3, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportConnect(client1, &error), NULL); sml_fail_unless(smlTransportConnect(client2, &error), NULL); sml_fail_unless(smlTransportConnect(client3, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_connect_done < 3 || server_connect_done < 3) { usleep(50); }; @@ -652,23 +652,23 @@ for (i = 0; i < num; i++) { data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportSend(client2, NULL, data, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportSend(client2, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportSend(client3, NULL, data, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportSend(client3, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); while (1) { @@ -681,7 +681,7 @@ sml_fail_unless(smlTransportDisconnect(client1, NULL, &error), NULL); sml_fail_unless(smlTransportDisconnect(client2, NULL, &error), NULL); sml_fail_unless(smlTransportDisconnect(client3, NULL, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_disconnect_done < 3 || server_disconnect_done < 3) { usleep(50); }; @@ -718,11 +718,11 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportConnect(client, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sleep(1); while (client_errors < 1) { usleep(50); }; @@ -764,12 +764,12 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(4)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportConnect(client, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_errors < 1 || server_connect_done < 1) { usleep(50); }; @@ -825,44 +825,44 @@ smlTransportSetEventCallback(client3, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client1, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(client2, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(client3, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(client1, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client2, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client3, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportConnect(client1, &error), NULL); sml_fail_unless(smlTransportConnect(client2, &error), NULL); sml_fail_unless(smlTransportConnect(client3, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_connect_done < 3 || server_connect_done < 3) { usleep(50); }; SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportSend(client1, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); data = smlTransportDataNew((char *)"error", 6, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportSend(client2, NULL, data, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportSend(client2, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); data = smlTransportDataNew((char *)"error", 6, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(error == NULL, "%s", error->message); - sml_fail_unless(smlTransportSend(client3, NULL, data, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportSend(client3, NULL, data, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportDataDeref(data); sml_fail_unless(smlTransportDisconnect(client1, NULL, &error), NULL); sml_fail_unless(smlTransportDisconnect(client2, NULL, &error), NULL); sml_fail_unless(smlTransportDisconnect(client3, NULL, &error), NULL); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); while (client_disconnect_done < 3 || server_disconnect_done < 3) { usleep(50); }; |
|
From: <svn...@op...> - 2009-07-13 12:51:35
|
Author: bellmich Date: Mon Jul 13 14:51:30 2009 New Revision: 1189 URL: http://libsyncml.opensync.org/changeset/1189 Log: fixed wrong error handling in HTTP tests Modified: trunk/tests/check_http.c trunk/tests/check_libsoup.c Modified: trunk/tests/check_http.c ============================================================================== --- trunk/tests/check_http.c Mon Jul 13 14:47:56 2009 (r1188) +++ trunk/tests/check_http.c Mon Jul 13 14:51:30 2009 (r1189) @@ -73,10 +73,10 @@ sml_fail_unless(tsp != NULL, NULL); sml_fail_unless(error == NULL, NULL); - sml_fail_unless(smlTransportSetConfigOption(tsp, "URL", "http://libsyncml.opensyncml.org", &error), "%s", error->message); + sml_fail_unless(smlTransportSetConfigOption(tsp, "URL", "http://libsyncml.opensyncml.org", &error), "%s", GET_ERROR_MESSAGE(error)); - sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportFinalize(tsp, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -125,11 +125,11 @@ sml_fail_unless(error == NULL, NULL); /* The transport is not configured but libsoup can initialize a default client */ - sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); - sml_fail_unless(smlTransportFinalize(tsp, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportFinalize(tsp, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(tsp); } @@ -211,9 +211,9 @@ if (GPOINTER_TO_INT(userdata) == 1) { data = smlTransportDataNew((char *)"answer", 7, SML_MIMETYPE_WBXML, FALSE, &locerror); sml_fail_unless(data != NULL, NULL); - sml_fail_unless(locerror == NULL, "%s", locerror->message); + sml_fail_unless(locerror == NULL, "%s", GET_ERROR_MESSAGE(locerror)); - sml_fail_unless(smlTransportSend(tsp, link_, data, &locerror), "%s", locerror->message); + sml_fail_unless(smlTransportSend(tsp, link_, data, &locerror), "%s", GET_ERROR_MESSAGE(locerror)); smlTransportDataDeref(data); } else if (GPOINTER_TO_INT(userdata) == 2) { @@ -222,7 +222,7 @@ smlTransportSendError(tsp, link_, newerror); SML_ERROR_FREE(newerror); } else if (GPOINTER_TO_INT(userdata) == 3) { - sml_fail_unless(smlTransportDisconnect(tsp, link_, &locerror), "%s", locerror->message); + sml_fail_unless(smlTransportDisconnect(tsp, link_, &locerror), "%s", GET_ERROR_MESSAGE(locerror)); } else { sml_fail_unless(FALSE, "Some unexpected userdata %i was detected.", GPOINTER_TO_INT(userdata)); } @@ -262,8 +262,8 @@ smlTransportSetEventCallback(tsp, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportFinalize(tsp, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -287,8 +287,8 @@ SML_ERROR_FREE(error); /* The default config of libsoup can be used to setup a valid transport. */ - sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(smlTransportInitialize(tsp, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportFinalize(tsp, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -312,8 +312,8 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(smlTransportConnect(client, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -325,7 +325,7 @@ /* disconnect the client */ - sml_fail_unless(smlTransportDisconnect(client, NULL, &error), "%s", error->message); + sml_fail_unless(smlTransportDisconnect(client, NULL, &error), "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(error == NULL, NULL); while (client_disconnects == 0) { usleep(50); }; @@ -358,8 +358,8 @@ smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); @@ -373,7 +373,7 @@ /* disconnect client */ - sml_fail_unless(smlTransportDisconnect(client, NULL, &error), "%s", error->message); + sml_fail_unless(smlTransportDisconnect(client, NULL, &error), "%s", GET_ERROR_MESSAGE(error)); while(client_disconnects < 1) { usleep(50); } /* disconnect server */ @@ -407,8 +407,8 @@ smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(3)); smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); @@ -457,8 +457,8 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); @@ -478,7 +478,7 @@ /* disconnect client */ - sml_fail_unless(smlTransportDisconnect(client, NULL, &error), "%s", error->message); + sml_fail_unless(smlTransportDisconnect(client, NULL, &error), "%s", GET_ERROR_MESSAGE(error)); while(client_disconnects < 1) { usleep(50); } /* disconnect server */ @@ -511,8 +511,8 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); SmlTransportData *data = NULL; @@ -539,7 +539,7 @@ /* disconnect client */ - sml_fail_unless(smlTransportDisconnect(client, NULL, &error), "%s", error->message); + sml_fail_unless(smlTransportDisconnect(client, NULL, &error), "%s", GET_ERROR_MESSAGE(error)); while(client_disconnects < 1) { usleep(50); } /* disconnect server */ @@ -579,7 +579,7 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); @@ -618,8 +618,8 @@ smlTransportSetEventCallback(client, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(2)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); @@ -647,7 +647,7 @@ sml_fail_unless(server_disconnects == 1, NULL); sml_fail_unless(smlTransportFinalize(client, &error), NULL); - sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportFinalize(server, &error), "%s", GET_ERROR_MESSAGE(error)); smlTransportFree(client); smlTransportFree(server); @@ -675,10 +675,10 @@ smlTransportSetEventCallback(client3, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client1, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(client2, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(client3, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client1, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client2, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client3, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); @@ -716,9 +716,9 @@ sml_fail_unless(client_receives == 3, NULL); sml_fail_unless(server_receives == 3, NULL); - sml_fail_unless(smlTransportDisconnect(client1, NULL, &error), "%s", error->message); - sml_fail_unless(smlTransportDisconnect(client2, NULL, &error), "%s", error->message); - sml_fail_unless(smlTransportDisconnect(client3, NULL, &error), "%s", error->message); + sml_fail_unless(smlTransportDisconnect(client1, NULL, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportDisconnect(client2, NULL, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportDisconnect(client3, NULL, &error), "%s", GET_ERROR_MESSAGE(error)); while (client_disconnects < 3) { usleep(100); }; @@ -731,7 +731,7 @@ * that the list will be cleaned up before * this for-loop ends */ - sml_fail_unless(smlTransportDisconnect(server, g_list_nth_data(links, i-1), &error), "%s", error->message); + sml_fail_unless(smlTransportDisconnect(server, g_list_nth_data(links, i-1), &error), "%s", GET_ERROR_MESSAGE(error)); while (server_disconnects < 3 - i + 1) { usleep(100); } @@ -775,10 +775,10 @@ smlTransportSetEventCallback(client3, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client1, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(client2, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(client3, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client1, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client2, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client3, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); SmlTransportData *data = smlTransportDataNew((char *)"test", 5, SML_MIMETYPE_XML, FALSE, &error); sml_fail_unless(data != NULL, NULL); @@ -818,7 +818,7 @@ sml_fail_unless(client_errors == 2, NULL); sml_fail_unless(server_receives == 3, NULL); - sml_fail_unless(smlTransportDisconnect(client1, NULL, &error), "%s", error->message); + sml_fail_unless(smlTransportDisconnect(client1, NULL, &error), "%s", GET_ERROR_MESSAGE(error)); while (client_disconnects < 1) { usleep(100); } @@ -831,7 +831,7 @@ * that the list will be cleaned up before * this for-loop ends */ - sml_fail_unless(smlTransportDisconnect(server, g_list_nth_data(links, i-1), &error), "%s", error->message); + sml_fail_unless(smlTransportDisconnect(server, g_list_nth_data(links, i-1), &error), "%s", GET_ERROR_MESSAGE(error)); while (server_disconnects < 3 - i + 1) { usleep(100); } @@ -876,10 +876,10 @@ smlTransportSetEventCallback(client3, _recv_client_event, GINT_TO_POINTER(1)); smlTransportSetEventCallback(server, _recv_server_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client1, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(client2, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(client3, &error), "%s", error->message); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client1, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client2, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(client3, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", GET_ERROR_MESSAGE(error)); SmlTransportData *data = NULL; @@ -924,9 +924,9 @@ sml_fail_unless(client_receives == 3 * num, NULL); sml_fail_unless(server_receives == 3 * num, NULL); - sml_fail_unless(smlTransportDisconnect(client1, NULL, &error), "%s", error->message); - sml_fail_unless(smlTransportDisconnect(client2, NULL, &error), "%s", error->message); - sml_fail_unless(smlTransportDisconnect(client3, NULL, &error), "%s", error->message); + sml_fail_unless(smlTransportDisconnect(client1, NULL, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportDisconnect(client2, NULL, &error), "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(smlTransportDisconnect(client3, NULL, &error), "%s", GET_ERROR_MESSAGE(error)); for (i = g_list_length(links); i > 0; i--) { /* start to disconnect from the end * to avoid conflicts with very fast SMP machines @@ -934,7 +934,7 @@ * that the list will be cleaned up before * this for-loop ends */ - sml_fail_unless(smlTransportDisconnect(server, g_list_nth_data(links, i-1), &error), "%s", error->message); + sml_fail_unless(smlTransportDisconnect(server, g_list_nth_data(links, i-1), &error), "%s", GET_ERROR_MESSAGE(error)); while (server_disconnects < (3 * num - i + 1)) { usleep(100); } Modified: trunk/tests/check_libsoup.c ============================================================================== --- trunk/tests/check_libsoup.c Mon Jul 13 14:47:56 2009 (r1188) +++ trunk/tests/check_libsoup.c Mon Jul 13 14:51:30 2009 (r1189) @@ -148,12 +148,12 @@ server_ctx = g_main_context_new(); sml_fail_unless(server_ctx != NULL, NULL); server_thread = smlThreadNew(server_ctx, &error); - sml_fail_unless(server_thread != NULL, "%s", error->message); + sml_fail_unless(server_thread != NULL, "%s", GET_ERROR_MESSAGE(error)); /* simulate the transport layer behaviour */ queue = smlQueueNew(&error); - sml_fail_unless(queue != NULL, "%s", error->message); + sml_fail_unless(queue != NULL, "%s", GET_ERROR_MESSAGE(error)); smlQueueSetHandler(queue, (SmlQueueHandler)transport_dummy_callback, NULL); smlQueueAttach(queue, server_ctx); @@ -296,7 +296,7 @@ SmlTransport *client = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); sml_fail_unless(smlTransportSetConfigOption(client, "URL", url, &error), NULL); smlTransportSetEventCallback(client, _recv_event, GINT_TO_POINTER(1)); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", GET_ERROR_MESSAGE(error)); /* send test message */ @@ -323,7 +323,7 @@ /* cleanup client */ - sml_fail_unless(smlTransportDisconnect(client, NULL, &error), "%s", error->message); + sml_fail_unless(smlTransportDisconnect(client, NULL, &error), "%s", GET_ERROR_MESSAGE(error)); sleep_total = 0; while (client_disconnects < 1 && client_errors < 1 && sleep_total < sleep_max) { @@ -405,10 +405,10 @@ client_ctx = g_main_context_new(); sml_fail_unless(client_ctx != NULL, NULL); SmlThread *client_thread = smlThreadNew(client_ctx, &error); - sml_fail_unless(client_thread != NULL, "%s", error->message); + sml_fail_unless(client_thread != NULL, "%s", GET_ERROR_MESSAGE(error)); smlThreadStart(client_thread); - sml_fail_unless(smlThreadCallFunction(client_thread, init_soup_session, msg, &error), "%s", error->message); + sml_fail_unless(smlThreadCallFunction(client_thread, init_soup_session, msg, &error), "%s", GET_ERROR_MESSAGE(error)); #endif /* test and cleanup server */ @@ -432,7 +432,7 @@ #else /* cleanup session */ - sml_fail_unless(smlThreadCallFunction(client_thread, cleanup_soup_session, NULL, &error), "%s", error->message); + sml_fail_unless(smlThreadCallFunction(client_thread, cleanup_soup_session, NULL, &error), "%s", GET_ERROR_MESSAGE(error)); /* The client thread must be stopped first * because libsoup is not thread safe. @@ -471,10 +471,10 @@ /* init server transport */ SmlTransport *serverTsp = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); - sml_fail_unless(serverTsp != NULL, "%s", error->message); + sml_fail_unless(serverTsp != NULL, "%s", GET_ERROR_MESSAGE(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", error->message); + sml_fail_unless(smlTransportInitialize(serverTsp, &error), "%s", GET_ERROR_MESSAGE(error)); /* client stuff */ |
|
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); |
|
From: <svn...@op...> - 2009-07-13 12:47:51
|
Author: bellmich Date: Mon Jul 13 14:47:38 2009 New Revision: 1187 URL: http://libsyncml.opensync.org/changeset/1187 Log: fixed wrong error handling while starting the XML parser Modified: trunk/tests/support.c Modified: trunk/tests/support.c ============================================================================== --- trunk/tests/support.c Mon Jul 13 14:47:01 2009 (r1186) +++ trunk/tests/support.c Mon Jul 13 14:47:38 2009 (r1187) @@ -140,8 +140,8 @@ setup_testbed(NULL); SmlParser *parser = smlParserNew(SML_MIMETYPE_XML, 0, error); - sml_fail_unless(parser != NULL, "%s", (*error)->message); - sml_fail_unless(*error == NULL, "%s", (*error)->message); + sml_fail_unless(parser != NULL, "%s", GET_ERROR_MESSAGE((*error))); + sml_fail_unless(*error == NULL, "%s", GET_ERROR_MESSAGE((*error))); if (!smlParserStart(parser, data, strlen(data), error)) { sml_fail_unless(*error != NULL, "The parser start failed but the error object was not set."); |
|
From: <svn...@op...> - 2009-07-13 12:47:09
|
Author: bellmich Date: Mon Jul 13 14:47:01 2009 New Revision: 1186 URL: http://libsyncml.opensync.org/changeset/1186 Log: fixed wrong assignment of parsed session ID Modified: trunk/libsyncml/parser/sml_xml_parse.c Modified: trunk/libsyncml/parser/sml_xml_parse.c ============================================================================== --- trunk/libsyncml/parser/sml_xml_parse.c Mon Jul 13 14:38:38 2009 (r1185) +++ trunk/libsyncml/parser/sml_xml_parse.c Mon Jul 13 14:47:01 2009 (r1186) @@ -2376,7 +2376,7 @@ guint64 id = 0; if (!_smlXmlParserGetID(parser, &id, SML_ELEMENT_SESSIONID, error)) goto error_free_header; - id = (*header)->sessionID; + (*header)->sessionID = id; } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_MSGID)) { guint64 id = 0; if (!_smlXmlParserGetID(parser, &id, SML_ELEMENT_MSGID, error)) |
|
From: <svn...@op...> - 2009-07-13 12:38:46
|
Author: bellmich Date: Mon Jul 13 14:38:38 2009 New Revision: 1185 URL: http://libsyncml.opensync.org/changeset/1185 Log: - fixed wrong GError handling - fixed wrong error detection code in XML parser Modified: trunk/libsyncml/parser/sml_xml_parse.c trunk/tests/check_xml_fix_broken_item_data.c trunk/tests/support.h Modified: trunk/libsyncml/parser/sml_xml_parse.c ============================================================================== --- trunk/libsyncml/parser/sml_xml_parse.c Mon Jul 13 14:37:49 2009 (r1184) +++ trunk/libsyncml/parser/sml_xml_parse.c Mon Jul 13 14:38:38 2009 (r1185) @@ -1864,14 +1864,14 @@ /* convert the whole strong to UTF-8 */ smlTrace(TRACE_INTERNAL, "%s: Converting %d bytes ...", __func__, last_utf16 - position + 1); - size_t read_bytes = 0; - size_t written_bytes = 0; + gsize read_bytes = 0; + gsize written_bytes = 0; gchar *conv_string = g_convert( position, (last_utf16 - position + 1), "UTF-8", "UTF-16", &read_bytes, &written_bytes, error); - if (error != NULL) + if (*error != NULL) { GError *ext = NULL; g_set_error(&ext, SML_ERROR, SML_ERROR_GENERIC, Modified: trunk/tests/check_xml_fix_broken_item_data.c ============================================================================== --- trunk/tests/check_xml_fix_broken_item_data.c Mon Jul 13 14:37:49 2009 (r1184) +++ trunk/tests/check_xml_fix_broken_item_data.c Mon Jul 13 14:38:38 2009 (r1185) @@ -36,8 +36,8 @@ input_data, strlen(input_data), &fixed_data, &fixed_size, &error), - "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(fixed_size == strlen(input_data), "The data must not be fixed (size has changed)."); sml_fail_unless(strcmp(input_data, fixed_data) == 0, "The data must not be fixed."); g_free(fixed_data); @@ -57,8 +57,8 @@ input_data, strlen(input_data), &fixed_data, &fixed_size, &error), - "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(fixed_size == strlen(input_data), "The data must not be fixed (size has changed)."); sml_fail_unless(strcmp(input_data, fixed_data) == 0, "The data must not be fixed."); g_free(fixed_data); @@ -78,8 +78,8 @@ input_data, strlen(input_data), &fixed_data, &fixed_size, &error), - "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(fixed_size == strlen(input_data), "The data must not be fixed (size has changed)."); sml_fail_unless(strcmp(input_data, fixed_data) == 0, "The data must not be fixed."); g_free(fixed_data); @@ -100,8 +100,8 @@ input_data, strlen(input_data), &fixed_data, &fixed_size, &error), - "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); /* compare it and check the expected length */ sml_fail_unless(fixed_size != strlen(input_data), "The data must be fixed (size has not changed)."); @@ -129,8 +129,8 @@ input_data, strlen(input_data), &fixed_data, &fixed_size, &error), - "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); /* compare it and check the expected length */ sml_fail_unless(fixed_size != strlen(input_data), "The data must be fixed (size has not changed)."); @@ -164,8 +164,8 @@ input_data, strlen(input_data), &fixed_data, &fixed_size, &error), - "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); /* compare it and check the expected length */ sml_fail_unless(fixed_size != strlen(input_data), "The data must be fixed (size has not changed)."); @@ -181,7 +181,7 @@ { GError *error = NULL; char *input_data = smlTryMalloc0(20, &error); - sml_fail_unless(error == NULL, "%s", error->message); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); input_data[0] = 65; /* A */ input_data[1] = 66; /* B */ input_data[3] = 67; /* C */ @@ -192,10 +192,10 @@ input_data[10] = 72; /* H */ input_data[12] = 73; /* I */ input_data[13] = 74; /* J */ - size_t length = 14; + gsize length = 14; char *fixed_data = NULL; - unsigned int fixed_size = 0; + gsize fixed_size = 0; /* check UTF-16 conversion of_smlXmlParserFixBrokenItemData */ @@ -204,8 +204,8 @@ input_data, length, &fixed_data, &fixed_size, &error), - "%s", error->message); - sml_fail_unless(error == NULL, "%s", error->message); + "%s", GET_ERROR_MESSAGE(error)); + sml_fail_unless(error == NULL, "%s", GET_ERROR_MESSAGE(error)); sml_fail_unless(fixed_size == strlen("ABCDEFGHIJ"), "%d != %d", fixed_size, strlen("ABCDEFGHIJ")); sml_fail_unless(strcmp(fixed_data, "ABCDEFGHIJ") == 0, NULL); g_free(input_data); Modified: trunk/tests/support.h ============================================================================== --- trunk/tests/support.h Mon Jul 13 14:37:49 2009 (r1184) +++ trunk/tests/support.h Mon Jul 13 14:38:38 2009 (r1185) @@ -115,4 +115,6 @@ ct = NULL; \ } +#define GET_ERROR_MESSAGE(error) error?error->message:"No GError set." + #endif // _TESTS_SUPPORT_H |
|
From: <svn...@op...> - 2009-07-13 12:37:55
|
Author: bellmich Date: Mon Jul 13 14:37:49 2009 New Revision: 1184 URL: http://libsyncml.opensync.org/changeset/1184 Log: fixed some wrong GError handling Modified: trunk/tests/check_md5.c Modified: trunk/tests/check_md5.c ============================================================================== --- trunk/tests/check_md5.c Mon Jul 13 14:19:46 2009 (r1183) +++ trunk/tests/check_md5.c Mon Jul 13 14:37:49 2009 (r1184) @@ -30,7 +30,7 @@ smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "d41d8cd98f00b204e9800998ecf8427e"), "%s", error->message); + sml_fail_unless(!strcmp(md5, "d41d8cd98f00b204e9800998ecf8427e"), "%s", error?error->message:"No GError set."); smlSafeCFree(&md5); } END_TEST @@ -44,7 +44,7 @@ smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "0cc175b9c0f1b6a831c399e269772661"), "%s", error->message); + sml_fail_unless(!strcmp(md5, "0cc175b9c0f1b6a831c399e269772661"), "%s", error?error->message:"No GError set."); smlSafeCFree(&md5); } END_TEST @@ -58,7 +58,7 @@ smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "900150983cd24fb0d6963f7d28e17f72"), "%s", error->message); + sml_fail_unless(!strcmp(md5, "900150983cd24fb0d6963f7d28e17f72"), "%s", error?error->message:"No GError set."); smlSafeCFree(&md5); } END_TEST @@ -72,7 +72,7 @@ smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "f96b697d7cb7938d525a2f31aaf161d0"), "%s", error->message); + sml_fail_unless(!strcmp(md5, "f96b697d7cb7938d525a2f31aaf161d0"), "%s", error?error->message:"No GError set."); smlSafeCFree(&md5); } END_TEST @@ -86,7 +86,7 @@ smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "c3fcd3d76192e4007dfb496cca67e13b"), "%s", error->message); + sml_fail_unless(!strcmp(md5, "c3fcd3d76192e4007dfb496cca67e13b"), "%s", error?error->message:"No GError set."); smlSafeCFree(&md5); } END_TEST @@ -100,7 +100,7 @@ smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "d174ab98d277d9f5a5611c2c9f419d9f"), "%s", error->message); + sml_fail_unless(!strcmp(md5, "d174ab98d277d9f5a5611c2c9f419d9f"), "%s", error?error->message:"No GError set."); smlSafeCFree(&md5); } END_TEST @@ -114,7 +114,7 @@ smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "57edf4a22be3c955ac49da2e2107b67a"), "%s", error->message); + sml_fail_unless(!strcmp(md5, "57edf4a22be3c955ac49da2e2107b67a"), "%s", error?error->message:"No GError set."); smlSafeCFree(&md5); } END_TEST |
|
From: <svn...@op...> - 2009-07-13 12:19:56
|
Author: bellmich Date: Mon Jul 13 14:19:46 2009 New Revision: 1183 URL: http://libsyncml.opensync.org/changeset/1183 Log: fixed wrong use of SML_SET_ERROR Modified: trunk/tests/check_error.c Modified: trunk/tests/check_error.c ============================================================================== --- trunk/tests/check_error.c Mon Jul 13 14:15:01 2009 (r1182) +++ trunk/tests/check_error.c Mon Jul 13 14:19:46 2009 (r1183) @@ -1,6 +1,7 @@ /* * libsyncml - A syncml protocol implementation * Copyright (C) 2005 Armin Bauer <arm...@op...> + * Copyright (C) 2009 Michael Bell <mic...@op...> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,10 +29,10 @@ setup_testbed(NULL); GError *error = NULL; - SML_SET_ERROR(&error, SML_ERROR_GENERIC, "test%i", 1); + g_set_error(&error, SML_ERROR, SML_ERROR_GENERIC, "test%i", 1); sml_fail_unless(error != NULL, NULL); - sml_fail_unless(error->code == SML_ERROR_GENERIC, NULL); - sml_fail_unless(!strcmp(error->message, "test1"), NULL); + sml_fail_unless(error->code == SML_ERROR_GENERIC, "Unexpected error code %d.", error->code); + sml_fail_unless(!strcmp(error->message, "test1"), "unexpected error message %s", error->message); SML_ERROR_FREE(error); sml_fail_unless(error == NULL, NULL); |
|
From: <svn...@op...> - 2009-07-13 12:15:10
|
Author: bellmich Date: Mon Jul 13 14:15:01 2009 New Revision: 1182 URL: http://libsyncml.opensync.org/changeset/1182 Log: migrated the following tests with the included script from SmlError to GError CHECKS=`ls check_*.c mobiles/*.c` echo -n Reverting to svn status ... svn revert $CHECKS echo DONE. echo Fixing checks: for CHECK in $CHECKS; do echo -n " $CHECK" echo -n . sed --in-place 's%SmlError%GError%' $CHECK echo -n . sed --in-place 's%smlErrorPrint(&error)%error->message%' $CHECK echo -n . sed --in-place 's%smlErrorPrint(&locerror)%locerror->message%' $CHECK echo -n . sed --in-place 's%smlErrorPrint(&eventError)%eventError->message%' $CHECK echo -n . sed --in-place 's%smlErrorPrint(error)%(*error)->message%' $CHECK echo -n . sed --in-place 's%smlErrorDeref(&locerror)%g_error_free(locerror)%' $CHECK echo -n . sed --in-place 's%smlErrorSet%SML_SET_ERROR%' $CHECK echo -n . sed --in-place 's%smlErrorDeref(&error)%SML_ERROR_FREE(error)%' $CHECK echo -n . sed --in-place 's%smlErrorDeref(&newerror)%SML_ERROR_FREE(newerror)%' $CHECK echo -n . sed --in-place 's%loc, loc, NULL%loc, loc, 0%' $CHECK echo -n . sed --in-place 's%loc, loc, "1"%loc, loc, 1%' $CHECK echo -n . sed --in-place 's%smlTransportSetError%smlTransportSendError%' $CHECK echo -n . sed --in-place 's%SmlBool%gboolean%' $CHECK echo DONE. done Modified: trunk/tests/check_data_sync_api.c trunk/tests/check_devinf.c trunk/tests/check_ds.c trunk/tests/check_manager.c trunk/tests/check_md5.c trunk/tests/check_wbxml_assembler.c trunk/tests/check_xml_assembler.c trunk/tests/check_xml_fix_broken_item_data.c Modified: trunk/tests/check_data_sync_api.c ============================================================================== --- trunk/tests/check_data_sync_api.c Mon Jul 13 14:14:20 2009 (r1181) +++ trunk/tests/check_data_sync_api.c Mon Jul 13 14:15:01 2009 (r1182) @@ -47,7 +47,7 @@ /* *********** CALLBACKS ************** */ /* ************************************ */ -SmlBool sendAllChanges( +gboolean sendAllChanges( SmlDataSyncObject *dsObject, GError **error) { @@ -142,7 +142,7 @@ exit(3); } -static SmlBool recvChangeCallback( +static gboolean recvChangeCallback( SmlDataSyncObject *dsObject, const char *source, SmlChangeType type, @@ -213,7 +213,7 @@ // if (o) o = o->next; // } // if (!datastore) { -// smlErrorSet(error, SML_ERROR_GENERIC, +// SML_SET_ERROR(error, SML_ERROR_GENERIC, // "Cannot found datastore %s.", // source); // goto error; Modified: trunk/tests/check_devinf.c ============================================================================== --- trunk/tests/check_devinf.c Mon Jul 13 14:14:20 2009 (r1181) +++ trunk/tests/check_devinf.c Mon Jul 13 14:15:01 2009 (r1182) @@ -43,7 +43,7 @@ unsigned int defaultMaxMsgSize = 10240; unsigned int defaultMaxObjSize = 1024000; -static void _manager_event(SmlManager *manager, SmlManagerEventType type, SmlSession *session, SmlError *error, void *userdata) +static void _manager_event(SmlManager *manager, SmlManagerEventType type, SmlSession *session, GError *error, void *userdata) { smlTrace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p)", __func__, manager, type, session, error, userdata); managerTracker *tracker = userdata; @@ -94,7 +94,7 @@ setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); @@ -113,8 +113,8 @@ smlManagerSetLocalMaxMsgSize(servermanager, defaultMaxMsgSize); smlManagerSetLocalMaxObjSize(servermanager, defaultMaxObjSize); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -197,8 +197,8 @@ smlSafeFree((gpointer *)&clienttracker); smlSafeFree((gpointer *)&servertracker); - sml_fail_unless(smlTransportFinalize(server, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportFinalize(client, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message); smlTransportFree(server); smlTransportFree(client); @@ -223,7 +223,7 @@ setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); @@ -242,8 +242,8 @@ smlManagerSetLocalMaxMsgSize(servermanager, defaultMaxMsgSize); smlManagerSetLocalMaxObjSize(servermanager, defaultMaxObjSize); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -304,7 +304,7 @@ smlAuthSetEnable(auth2, FALSE); smlAuthRegister(auth2, servermanager, &error); - clienttracker->session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_11, SML_PROTOCOL_SYNCML, loc, loc, NULL, 0, &error); + clienttracker->session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_11, SML_PROTOCOL_SYNCML, loc, loc, 0, 0, &error); sml_fail_unless(smlManagerSessionAdd(clientmanager, clienttracker->session, NULL, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -382,8 +382,8 @@ smlManagerFree(clientmanager); smlManagerFree(servermanager); - sml_fail_unless(smlTransportFinalize(server, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportFinalize(client, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message); smlTransportFree(server); smlTransportFree(client); Modified: trunk/tests/check_ds.c ============================================================================== --- trunk/tests/check_ds.c Mon Jul 13 14:14:20 2009 (r1181) +++ trunk/tests/check_ds.c Mon Jul 13 14:15:01 2009 (r1182) @@ -245,7 +245,7 @@ smlTrace(TRACE_EXIT, "%s", __func__); } -static SmlBool _recv_alert(SmlDsSession *dsession, SmlAlertType type, const char *last, const char *next, void *userdata) +static gboolean _recv_alert(SmlDsSession *dsession, SmlAlertType type, const char *last, const char *next, void *userdata) { smlTrace(TRACE_ENTRY, "%s(%p, %i, %s, %s, %p)", __func__, dsession, type, VA_STRING(last), VA_STRING(next), userdata); @@ -267,7 +267,7 @@ smlTrace(TRACE_EXIT, "%s", __func__); } -static SmlBool _recv_changes(SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, unsigned int size, const char *contenttype, void *userdata, GError **error) +static gboolean _recv_changes(SmlDsSession *dsession, SmlChangeType type, const char *uid, char *data, unsigned int size, const char *contenttype, void *userdata, GError **error) { smlTrace(TRACE_ENTRY, "%s(%p, %i, %s, %s, %i, %s, %p, %p)", __func__, dsession, type, VA_STRING(uid), VA_STRING(data), size, VA_STRING(contenttype), userdata, error); Modified: trunk/tests/check_manager.c ============================================================================== --- trunk/tests/check_manager.c Mon Jul 13 14:14:20 2009 (r1181) +++ trunk/tests/check_manager.c Mon Jul 13 14:15:01 2009 (r1182) @@ -39,7 +39,7 @@ { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); SmlManager *manager = smlManagerNew(server, &error); @@ -56,7 +56,7 @@ { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); SmlManager *manager = smlManagerNew(server, &error); @@ -107,7 +107,7 @@ setup_testbed(NULL); } -static void _manager_event(SmlManager *manager, SmlManagerEventType type, SmlSession *session, SmlError *error, void *userdata) +static void _manager_event(SmlManager *manager, SmlManagerEventType type, SmlSession *session, GError *error, void *userdata) { smlTrace(TRACE_ENTRY, "%s(%p, %i, %p, %p, %p)", __func__, manager, type, session, error, userdata); managerTracker *tracker = userdata; @@ -154,7 +154,7 @@ { smlTrace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, session, header, cred, userdata); smlAssert(session); - SmlError *error = NULL; + GError *error = NULL; SmlStatus *reply = smlStatusNew(SML_AUTH_ACCEPTED, 0, session->lastReceivedMessageID, session->source, session->target, SML_COMMAND_TYPE_HEADER, &error); if (!reply) @@ -171,8 +171,8 @@ return; error: - smlTrace(TRACE_EXIT_ERROR, "%s - %s", __func__, smlErrorPrint(&error)); - smlErrorDeref(&error); + smlTrace(TRACE_EXIT_ERROR, "%s - %s", __func__, error->message); + SML_ERROR_FREE(error); return; } @@ -180,7 +180,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); SmlTransport *client = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); @@ -195,8 +195,8 @@ SmlManager *servermanager = servertracker->manager = smlManagerNew(server, &error); smlManagerSetEventCallback(servertracker->manager, _manager_event, servertracker); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -242,7 +242,7 @@ g_free(servertracker); sml_fail_unless(smlTransportFinalize(client, &error), NULL); - sml_fail_unless(smlTransportFinalize(server, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message); smlTransportFree(client); smlTransportFree(server); @@ -253,7 +253,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); SmlTransport *client = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); @@ -271,8 +271,8 @@ smlManagerSetLocalMaxObjSize(servertracker->manager, defaultMaxObjSize); smlManagerRegisterHeaderHandler(servermanager, _header_callback, NULL, NULL); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -336,7 +336,7 @@ { reset_testbed(); - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); SmlTransport *client = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); @@ -354,8 +354,8 @@ smlManagerSetLocalMaxObjSize(servertracker->manager, defaultMaxObjSize); smlManagerRegisterHeaderHandler(servermanager, _header_callback, NULL, NULL); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -462,7 +462,7 @@ static void _recv_alert(SmlSession *session, SmlCommand *cmd, void *userdata) { smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, session, cmd, userdata); - SmlError *error = NULL; + GError *error = NULL; num_alerts++; @@ -481,9 +481,9 @@ return; error: - smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(&error)); + smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, error->message); if (error) - smlErrorDeref(&error); + SML_ERROR_FREE(error); } static void _status_reply(SmlSession *session, SmlStatus *status, void *userdata) @@ -510,7 +510,7 @@ reset_testbed(); GError *gerror = NULL; - SmlError *error = NULL; + GError *error = NULL; SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); SmlTransport *client = smlTransportNew(SML_TRANSPORT_HTTP_CLIENT, &error); @@ -527,8 +527,8 @@ smlManagerSetLocalMaxMsgSize(servertracker->manager, defaultMaxMsgSize); smlManagerSetLocalMaxObjSize(servertracker->manager, defaultMaxObjSize); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -543,7 +543,7 @@ sml_fail_unless(error == NULL, NULL); smlManagerRegisterHeaderHandler(servermanager, _header_callback, NULL, NULL); - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, NULL, 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 0, 0, &error); sml_fail_unless(smlManagerSessionAdd(clientmanager, session, NULL, &error), NULL); sml_fail_unless(error == NULL, NULL); @@ -617,8 +617,8 @@ smlManagerFree(clientmanager); smlManagerFree(servermanager); - sml_fail_unless(smlTransportFinalize(server, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportFinalize(client, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportFinalize(server, &error), "%s", error->message); + sml_fail_unless(smlTransportFinalize(client, &error), "%s", error->message); smlTransportFree(server); smlTransportFree(client); @@ -630,7 +630,7 @@ reset_testbed(); GError *gerror = NULL; - SmlError *error = NULL; + GError *error = NULL; SmlLocation *loc = sml_location_new_with_options("test", NULL, &gerror); SmlTransport *server = smlTransportNew(SML_TRANSPORT_HTTP_SERVER, &error); @@ -647,8 +647,8 @@ SmlManager *servermanager = servertracker->manager = smlManagerNew(server, &error); smlManagerSetEventCallback(servertracker->manager, _manager_event, servertracker); - sml_fail_unless(smlTransportInitialize(client, &error), "%s", smlErrorPrint(&error)); - sml_fail_unless(smlTransportInitialize(server, &error), "%s", smlErrorPrint(&error)); + sml_fail_unless(smlTransportInitialize(client, &error), "%s", error->message); + sml_fail_unless(smlTransportInitialize(server, &error), "%s", error->message); sml_fail_unless(smlManagerStart(clientmanager, &error), NULL); sml_fail_unless(error == NULL, NULL); Modified: trunk/tests/check_md5.c ============================================================================== --- trunk/tests/check_md5.c Mon Jul 13 14:14:20 2009 (r1181) +++ trunk/tests/check_md5.c Mon Jul 13 14:15:01 2009 (r1182) @@ -25,12 +25,12 @@ { const char *data = ""; unsigned char digest[16]; - SmlError *error = NULL; + GError *error = NULL; smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "d41d8cd98f00b204e9800998ecf8427e"), "%s", smlErrorPrint(&error)); + sml_fail_unless(!strcmp(md5, "d41d8cd98f00b204e9800998ecf8427e"), "%s", error->message); smlSafeCFree(&md5); } END_TEST @@ -39,12 +39,12 @@ { const char *data = "a"; unsigned char digest[16]; - SmlError *error = NULL; + GError *error = NULL; smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "0cc175b9c0f1b6a831c399e269772661"), "%s", smlErrorPrint(&error)); + sml_fail_unless(!strcmp(md5, "0cc175b9c0f1b6a831c399e269772661"), "%s", error->message); smlSafeCFree(&md5); } END_TEST @@ -53,12 +53,12 @@ { const char *data = "abc"; unsigned char digest[16]; - SmlError *error = NULL; + GError *error = NULL; smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "900150983cd24fb0d6963f7d28e17f72"), "%s", smlErrorPrint(&error)); + sml_fail_unless(!strcmp(md5, "900150983cd24fb0d6963f7d28e17f72"), "%s", error->message); smlSafeCFree(&md5); } END_TEST @@ -67,12 +67,12 @@ { const char *data = "message digest"; unsigned char digest[16]; - SmlError *error = NULL; + GError *error = NULL; smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "f96b697d7cb7938d525a2f31aaf161d0"), "%s", smlErrorPrint(&error)); + sml_fail_unless(!strcmp(md5, "f96b697d7cb7938d525a2f31aaf161d0"), "%s", error->message); smlSafeCFree(&md5); } END_TEST @@ -81,12 +81,12 @@ { const char *data = "abcdefghijklmnopqrstuvwxyz"; unsigned char digest[16]; - SmlError *error = NULL; + GError *error = NULL; smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "c3fcd3d76192e4007dfb496cca67e13b"), "%s", smlErrorPrint(&error)); + sml_fail_unless(!strcmp(md5, "c3fcd3d76192e4007dfb496cca67e13b"), "%s", error->message); smlSafeCFree(&md5); } END_TEST @@ -95,12 +95,12 @@ { const char *data = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; unsigned char digest[16]; - SmlError *error = NULL; + GError *error = NULL; smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "d174ab98d277d9f5a5611c2c9f419d9f"), "%s", smlErrorPrint(&error)); + sml_fail_unless(!strcmp(md5, "d174ab98d277d9f5a5611c2c9f419d9f"), "%s", error->message); smlSafeCFree(&md5); } END_TEST @@ -109,12 +109,12 @@ { const char *data = "12345678901234567890123456789012345678901234567890123456789012345678901234567890"; unsigned char digest[16]; - SmlError *error = NULL; + GError *error = NULL; smlMD5GetDigest(data, strlen(data), digest); char *md5 = smlMD5ToString(digest, &error); - sml_fail_unless(!strcmp(md5, "57edf4a22be3c955ac49da2e2107b67a"), "%s", smlErrorPrint(&error)); + sml_fail_unless(!strcmp(md5, "57edf4a22be3c955ac49da2e2107b67a"), "%s", error->message); smlSafeCFree(&md5); } END_TEST Modified: trunk/tests/check_wbxml_assembler.c ============================================================================== --- trunk/tests/check_wbxml_assembler.c Mon Jul 13 14:14:20 2009 (r1181) +++ trunk/tests/check_wbxml_assembler.c Mon Jul 13 14:15:01 2009 (r1182) @@ -29,7 +29,7 @@ static SmlAssembler *start_assembler(SmlSession *session, unsigned int limit) { - SmlError *error = NULL; + GError *error = NULL; SmlAssembler *assm = smlAssemblerNew(SML_MIMETYPE_WBXML, limit, &error); sml_fail_unless(assm != NULL, NULL); @@ -46,7 +46,7 @@ START_TEST (wbxml_assembler_message_empty) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -56,7 +56,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); g_object_unref(loc); SmlAssembler *assm = start_assembler(session, 0); @@ -66,14 +66,14 @@ unsigned int size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(smlAssemblerFlush(assm) == 1, NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -83,7 +83,7 @@ START_TEST (wbxml_assembler_message_only_header) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -93,7 +93,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); g_object_unref(loc); SmlAssembler *assm = start_assembler(session, 0); @@ -106,14 +106,14 @@ unsigned int size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(smlAssemblerFlush(assm) == 1, NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -123,7 +123,7 @@ START_TEST (wbxml_assembler_message_status) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -133,7 +133,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); g_object_unref(loc); SmlAssembler *assm = start_assembler(session, 0); @@ -167,7 +167,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -177,7 +177,7 @@ START_TEST (wbxml_assembler_message_cmd) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -187,7 +187,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -229,7 +229,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -239,7 +239,7 @@ START_TEST (wbxml_assembler_message_subcmd) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -249,7 +249,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -295,7 +295,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -305,7 +305,7 @@ START_TEST (wbxml_assembler_message_several_subcmd) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -315,7 +315,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -401,7 +401,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -411,7 +411,7 @@ START_TEST (wbxml_assembler_message_flush_open) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -421,7 +421,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -484,7 +484,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -494,7 +494,7 @@ START_TEST (wbxml_assembler_out_of_order) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -504,7 +504,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -600,7 +600,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -610,7 +610,7 @@ START_TEST (wbxml_assembler_limit1) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -620,20 +620,20 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 1); sml_fail_unless(assm != NULL, NULL); sml_fail_unless(!smlAssemblerAddHeader(assm, session, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); char *data = NULL; unsigned int size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -643,7 +643,7 @@ START_TEST (wbxml_assembler_limit2) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -653,20 +653,20 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 50); sml_fail_unless(assm != NULL, NULL); sml_fail_unless(!smlAssemblerAddHeader(assm, session, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); char *data = NULL; unsigned int size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -676,7 +676,7 @@ START_TEST (wbxml_assembler_limit3) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -686,7 +686,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 100); sml_fail_unless(assm != NULL, NULL); @@ -710,7 +710,7 @@ unsigned int size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -720,7 +720,7 @@ START_TEST (wbxml_assembler_limit4) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -730,7 +730,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 380); sml_fail_unless(assm != NULL, NULL); @@ -764,7 +764,7 @@ START_TEST (wbxml_assembler_limit5) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -774,7 +774,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 150); sml_fail_unless(assm != NULL, NULL); @@ -836,7 +836,7 @@ START_TEST (wbxml_assembler_complex1) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -846,7 +846,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); Modified: trunk/tests/check_xml_assembler.c ============================================================================== --- trunk/tests/check_xml_assembler.c Mon Jul 13 14:14:20 2009 (r1181) +++ trunk/tests/check_xml_assembler.c Mon Jul 13 14:15:01 2009 (r1182) @@ -26,7 +26,7 @@ static SmlAssembler *start_assembler(SmlSession *session, unsigned int limit) { - SmlError *error = NULL; + GError *error = NULL; SmlAssembler *assm = smlAssemblerNew(SML_MIMETYPE_XML, limit, &error); sml_fail_unless(assm != NULL, NULL); @@ -43,7 +43,7 @@ START_TEST (xml_assembler_message_empty) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -53,7 +53,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); g_object_unref(loc); @@ -64,14 +64,14 @@ unsigned int size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(smlAssemblerFlush(assm) == 1, NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -81,7 +81,7 @@ START_TEST (xml_assembler_message_only_header) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -91,7 +91,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); g_object_unref(loc); @@ -105,14 +105,14 @@ unsigned int size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(smlAssemblerFlush(assm) == 1, NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -122,7 +122,7 @@ START_TEST (xml_assembler_message_status) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -132,7 +132,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -168,7 +168,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -178,7 +178,7 @@ START_TEST (xml_assembler_message_cmd) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -188,7 +188,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -225,7 +225,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -235,7 +235,7 @@ START_TEST (xml_assembler_message_subcmd) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -245,7 +245,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -295,7 +295,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -305,7 +305,7 @@ START_TEST (xml_assembler_message_several_subcmd) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -315,7 +315,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -409,7 +409,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -419,7 +419,7 @@ START_TEST (xml_assembler_message_flush_open) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -429,7 +429,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -501,7 +501,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -522,7 +522,7 @@ START_TEST (xml_assembler_out_of_order) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -532,7 +532,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -636,7 +636,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -646,7 +646,7 @@ START_TEST (xml_assembler_limit1) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -656,7 +656,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); g_object_unref(loc); @@ -665,13 +665,13 @@ sml_fail_unless(!smlAssemblerAddHeader(assm, session, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); char *data = NULL; unsigned int size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -681,7 +681,7 @@ START_TEST (xml_assembler_limit2) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -691,7 +691,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); g_object_unref(loc); @@ -700,13 +700,13 @@ sml_fail_unless(!smlAssemblerAddHeader(assm, session, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); char *data = NULL; unsigned int size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -716,7 +716,7 @@ START_TEST (xml_assembler_limit3) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -726,7 +726,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 220); sml_fail_unless(assm != NULL, NULL); @@ -752,7 +752,7 @@ unsigned int size = 0; sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlAssemblerFree(assm); smlSessionUnref(session); @@ -762,7 +762,7 @@ START_TEST (xml_assembler_limit4) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -772,7 +772,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 380); sml_fail_unless(assm != NULL, NULL); @@ -809,7 +809,7 @@ START_TEST (xml_assembler_limit5) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -819,7 +819,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 500); sml_fail_unless(assm != NULL, NULL); @@ -884,7 +884,7 @@ START_TEST (xml_assembler_devinf) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -894,7 +894,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -958,7 +958,7 @@ START_TEST (xml_assembler_devinf12) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -968,7 +968,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -1032,7 +1032,7 @@ START_TEST (xml_assembler_order) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1042,7 +1042,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -1097,7 +1097,7 @@ smlSessionUnref(session); SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(parser != NULL, "%s", error->message); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -1134,8 +1134,8 @@ sml_fail_unless(status == NULL, NULL); sml_fail_unless(error == NULL, NULL); - SmlBool final = TRUE; - SmlBool end = TRUE; + gboolean final = TRUE; + gboolean end = TRUE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == FALSE, NULL); @@ -1160,7 +1160,7 @@ START_TEST (xml_assembler_reuse) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1170,7 +1170,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -1199,7 +1199,7 @@ sml_fail_unless(error != NULL, NULL); sml_fail_unless(data == NULL, NULL); sml_fail_unless(size == 0, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(smlAssemblerAddStatus(assm, status, &error) == SML_ASSEMBLER_RESULT_OK, NULL); sml_fail_unless(error == NULL, NULL); @@ -1213,7 +1213,7 @@ sml_fail_unless(error != NULL, NULL); sml_fail_unless(data == NULL, NULL); sml_fail_unless(size == 0, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); /* Must work */ sml_fail_unless(smlAssemblerRun(assm, &data, &size, NULL, FALSE, &error), NULL); @@ -1229,7 +1229,7 @@ sml_fail_unless(smlAssemblerIsStatusMissing(assm) == TRUE, NULL); SmlParser *parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(parser != NULL, "%s", error->message); SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -1252,8 +1252,8 @@ sml_fail_unless(status == NULL, NULL); sml_fail_unless(error == NULL, NULL); - SmlBool final = TRUE; - SmlBool end = TRUE; + gboolean final = TRUE; + gboolean end = TRUE; sml_fail_unless(smlParserEnd(parser, &final, &end, &error), NULL); sml_fail_unless(error == NULL, NULL); sml_fail_unless(final == FALSE, NULL); @@ -1293,7 +1293,7 @@ smlSessionUnref(session); parser = start_parser(data, &error); - sml_fail_unless(parser != NULL, "%s", smlErrorPrint(&error)); + sml_fail_unless(parser != NULL, "%s", error->message); header = NULL; sml_fail_unless(smlParserGetHeader(parser, &header, &cred, &error), NULL); @@ -1338,7 +1338,7 @@ START_TEST (xml_assembler_leak) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1348,7 +1348,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -1370,7 +1370,7 @@ sml_fail_unless(error != NULL, NULL); sml_fail_unless(data == NULL, NULL); sml_fail_unless(size == 0, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(smlAssemblerFlush(assm) == 4, NULL); sml_fail_unless(error == NULL, NULL); @@ -1389,7 +1389,7 @@ sml_fail_unless(smlAssemblerAddStatus(assm, status, &error) != SML_ASSEMBLER_RESULT_OK, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlStatusUnref(status); @@ -1398,7 +1398,7 @@ sml_fail_unless(error != NULL, NULL); sml_fail_unless(data == NULL, NULL); sml_fail_unless(size == 0, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); sml_fail_unless(smlAssemblerFlush(assm) == 1, NULL); sml_fail_unless(error == NULL, NULL); @@ -1442,7 +1442,7 @@ int num_cmd = 1000; int num_status = 1000; - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1452,7 +1452,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, 0); sml_fail_unless(assm != NULL, NULL); @@ -1505,7 +1505,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); g_object_unref(loc); smlAssemblerFree(assm); @@ -1521,7 +1521,7 @@ int limit = 50000; - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1531,7 +1531,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, limit); sml_fail_unless(assm != NULL, NULL); @@ -1564,7 +1564,7 @@ sml_fail_unless(smlAssemblerAddStatus(assm, status, &error) == SML_ASSEMBLER_RESULT_OK, NULL); sml_fail_unless(error == NULL, NULL); } else if (res != SML_ASSEMBLER_RESULT_OK) { - sml_fail_unless(FALSE, "%s", smlErrorPrint(&error)); + sml_fail_unless(FALSE, "%s", error->message); } smlStatusUnref(status); @@ -1594,7 +1594,7 @@ sml_fail_unless(smlAssemblerStartCommand(assm, NULL, cmd1, &error), NULL); sml_fail_unless(error == NULL, NULL); } else if (res != SML_ASSEMBLER_RESULT_OK) { - sml_fail_unless(FALSE, "%s", smlErrorPrint(&error)); + sml_fail_unless(FALSE, "%s", error->message); } smlCommandUnref(cmd1); @@ -1617,7 +1617,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); g_object_unref(loc); smlAssemblerFree(assm); @@ -1633,7 +1633,7 @@ int limit = 500000000; - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1643,7 +1643,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, limit); sml_fail_unless(assm != NULL, NULL); @@ -1695,7 +1695,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); g_object_unref(loc); smlAssemblerFree(assm); @@ -1708,7 +1708,7 @@ setup_testbed(NULL); int limit = 500000; - SmlError *error = NULL; + GError *error = NULL; GError *gerror = NULL; SmlLocation *loc = sml_location_new_with_options("/test", NULL, &gerror); @@ -1718,7 +1718,7 @@ /* The session type must be SML_SESSION_TYPE_CLIENT * because servers of SyncML 1.1 or higher must send MaxMsgSize. */ - SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, "1", 0, &error); + SmlSession *session = smlSessionNew(SML_SESSION_TYPE_CLIENT, SML_MIMETYPE_XML, SML_VERSION_12, SML_PROTOCOL_SYNCML, loc, loc, 1, 0, &error); SmlAssembler *assm = start_assembler(session, limit); sml_fail_unless(assm != NULL, NULL); @@ -1767,7 +1767,7 @@ sml_fail_unless(!smlAssemblerStartCommand(assm, cmd1, cmd2, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); smlCommandUnref(cmd2); @@ -1793,7 +1793,7 @@ sml_fail_unless(!smlAssemblerRun(assm, &data, &size, NULL, TRUE, &error), NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); g_object_unref(loc); smlAssemblerFree(assm); Modified: trunk/tests/check_xml_fix_broken_item_data.c ============================================================================== --- trunk/tests/check_xml_fix_broken_item_data.c Mon Jul 13 14:14:20 2009 (r11... [truncated message content] |
|
From: <svn...@op...> - 2009-07-13 12:14:31
|
Author: bellmich Date: Mon Jul 13 14:14:20 2009 New Revision: 1181 URL: http://libsyncml.opensync.org/changeset/1181 Log: migrated support files from SmlError to GError Modified: trunk/tests/support.c trunk/tests/support.h Modified: trunk/tests/support.c ============================================================================== --- trunk/tests/support.c Mon Jul 13 14:13:56 2009 (r1180) +++ trunk/tests/support.c Mon Jul 13 14:14:20 2009 (r1181) @@ -134,14 +134,14 @@ suite_add_tcase (s, tc_new); } -SmlParser *start_parser(const char *data, SmlError **error) +SmlParser *start_parser(const char *data, GError **error) { CHECK_ERROR_REF setup_testbed(NULL); SmlParser *parser = smlParserNew(SML_MIMETYPE_XML, 0, error); - sml_fail_unless(parser != NULL, "%s", smlErrorPrint(error)); - sml_fail_unless(*error == NULL, "%s", smlErrorPrint(error)); + sml_fail_unless(parser != NULL, "%s", (*error)->message); + sml_fail_unless(*error == NULL, "%s", (*error)->message); if (!smlParserStart(parser, data, strlen(data), error)) { sml_fail_unless(*error != NULL, "The parser start failed but the error object was not set."); Modified: trunk/tests/support.h ============================================================================== --- trunk/tests/support.h Mon Jul 13 14:13:56 2009 (r1180) +++ trunk/tests/support.h Mon Jul 13 14:14:20 2009 (r1181) @@ -30,7 +30,7 @@ char *setup_testbed(char *fkt_name); void destroy_testbed(char *path); void create_case(Suite *s, const char *name, TFun function); -SmlParser *start_parser(const char *data, SmlError **error); +SmlParser *start_parser(const char *data, GError **error); int sml_sleep(int64_t nanoseconds); #ifdef THREAD_SAFE_CHECK |
|
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] |
|
From: <svn...@op...> - 2009-07-13 12:12:40
|
Author: bellmich Date: Mon Jul 13 14:12:22 2009 New Revision: 1179 URL: http://libsyncml.opensync.org/changeset/1179 Log: migrated check_wbxml_parser from SmlError to GError Modified: trunk/tests/check_wbxml_parser.c Modified: trunk/tests/check_wbxml_parser.c ============================================================================== --- trunk/tests/check_wbxml_parser.c Mon Jul 13 14:09:45 2009 (r1178) +++ trunk/tests/check_wbxml_parser.c Mon Jul 13 14:12:22 2009 (r1179) @@ -27,12 +27,13 @@ #include <libsyncml/sml_command_internals.h> #include <libsyncml/sml_elements_internals.h> +#include <libsyncml/sml_error_internals.h> static SmlParser *start_wbxml_parser(const char *data) { setup_testbed(NULL); - SmlError *error = NULL; + GError *error = NULL; SmlParser *parser = smlParserNew(SML_MIMETYPE_WBXML, 0, &error); sml_fail_unless(parser != NULL, NULL); sml_fail_unless(error == NULL, NULL); @@ -45,7 +46,7 @@ if (!smlParserStart(parser, buffer, size, &error)) { sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); /* the error is not used */ + SML_ERROR_FREE(error); /* the error is not used */ smlParserFree(parser); smlSafeCFree(&buffer); @@ -72,7 +73,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -80,11 +81,11 @@ sml_fail_unless(header == NULL, NULL); sml_fail_unless(cred == 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); } @@ -104,7 +105,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -112,7 +113,7 @@ sml_fail_unless(header == NULL, NULL); sml_fail_unless(cred == NULL, NULL); sml_fail_unless(error != NULL, NULL); - smlErrorDeref(&error); + SML_ERROR_FREE(error); /* The empty SyncHdr is followed by an empty SyncHdr. * So the parser is at the correct position to finish successfully. @@ -130,7 +131,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -138,11 +139,11 @@ sml_fail_unless(header == NULL, NULL); sml_fail_unless(cred == 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); } @@ -154,7 +155,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -162,11 +163,11 @@ sml_fail_unless(header == NULL, NULL); sml_fail_unless(cred == 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); } @@ -178,7 +179,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -186,11 +187,11 @@ sml_fail_unless(header == NULL, NULL); sml_fail_unless(cred == 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); } @@ -202,7 +203,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -210,11 +211,11 @@ sml_fail_unless(header == NULL, NULL); sml_fail_unless(cred == 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); } @@ -226,7 +227,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -234,11 +235,11 @@ sml_fail_unless(header == NULL, NULL); sml_fail_unless(cred == 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); } @@ -250,7 +251,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -264,7 +265,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; @@ -286,11 +287,11 @@ START_TEST (wbxml_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>"; + 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>"; SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -304,7 +305,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; @@ -330,7 +331,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -338,11 +339,11 @@ sml_fail_unless(header == NULL, NULL); sml_fail_unless(cred == 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); } @@ -354,7 +355,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -370,7 +371,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); @@ -390,7 +391,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -406,7 +407,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); } @@ -418,7 +419,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -434,7 +435,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); } @@ -446,7 +447,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -462,7 +463,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); } @@ -474,7 +475,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -514,7 +515,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -546,8 +547,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); @@ -563,7 +564,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -595,8 +596,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); @@ -612,7 +613,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -644,8 +645,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); @@ -661,7 +662,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -693,8 +694,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); @@ -710,7 +711,7 @@ SmlParser *parser = start_wbxml_parser(data); sml_fail_unless(parser != NULL, NULL); - SmlError *error = NULL; + GError *error = NULL; SmlHeader *header = NULL; SmlCred *cred = NULL; @@ -742,8 +743,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); |
