[Opensync-commits] r1158 - trunk/libsyncml/parser

[<svn...@op...>]

Author: bellmich
Date: Wed Jul  8 16:18:21 2009
New Revision: 1158
URL: http://libsyncml.opensync.org/changeset/1158

Log:
migrated parser/sml_wbxml from SmlError to SmlBool

Modified:
   trunk/libsyncml/parser/sml_wbxml.c
   trunk/libsyncml/parser/sml_wbxml.h
   trunk/libsyncml/parser/sml_wbxml_internals.h
   trunk/libsyncml/parser/sml_xml_assm.h

Modified: trunk/libsyncml/parser/sml_wbxml.c
==============================================================================
--- trunk/libsyncml/parser/sml_wbxml.c	Wed Jul  8 12:22:14 2009	(r1157)
+++ trunk/libsyncml/parser/sml_wbxml.c	Wed Jul  8 16:18:21 2009	(r1158)
@@ -36,7 +36,12 @@
 #include "sml_wbxml.h"
 #include "sml_wbxml_internals.h"
 
-SmlBool smlWbxmlConvertTo(WBXMLConvXML2WBXMLParams *params, const char *input, char **output, size_t *outputLen, SmlError** error)
+gboolean
+smlWbxmlConvertTo (WBXMLConvXML2WBXMLParams *params,
+                   const gchar *input,
+                   gchar **output,
+                   gsize *outputLen,
+                   GError** error)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %p)", __func__, params, input, output, outputLen, error);
 	smlAssert(input);
@@ -51,14 +56,20 @@
 	
 	smlTrace(TRACE_EXIT, "%s", __func__);
 	return TRUE;
-
 error:
-	smlErrorSet(error, SML_ERROR_GENERIC, (char *)wbxml_errors_string(wberror));
-	smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
+	g_set_error(error, SML_ERROR, SML_ERROR_GENERIC,
+	            "%s", (const char *)wbxml_errors_string(wberror));
+	smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, (*error)->message);
 	return FALSE;
 }
 
-SmlBool smlWbxmlConvertFrom(WBXMLConvWBXML2XMLParams *params, const char *input, size_t inputLen, char **output, size_t *outputLen, SmlError** error)
+gboolean
+smlWbxmlConvertFrom (WBXMLConvWBXML2XMLParams *params,
+                     const gchar *input,
+                     gsize inputLen,
+                     gchar **output,
+                     gsize *outputLen,
+                     GError** error)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %p, %i, %p, %p, %p)", __func__, params, input, inputLen, output, outputLen, error);
 	WBXMLError wberror;
@@ -70,14 +81,18 @@
 	
 	smlTrace(TRACE_EXIT, "%s", __func__);
 	return TRUE;
-	
 error:
-	smlErrorSet(error, SML_ERROR_GENERIC, (char *)wbxml_errors_string(wberror));
-	smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
+	g_set_error(error, SML_ERROR, SML_ERROR_GENERIC,
+	            "%s", (const char *)wbxml_errors_string(wberror));
+	smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, (*error)->message);
 	return FALSE;
 }
 
-static SmlBool smlWbxmlParserStart(SmlXmlParser *parser, const char *data, unsigned int size, SmlError **error)
+static gboolean
+smlWbxmlParserStart (SmlXmlParser *parser,
+                     const gchar *data,
+                     gsize size,
+                     GError **error)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %p, %p, %p)", __func__, parser, data, size, error);
 	CHECK_ERROR_REF
@@ -107,15 +122,16 @@
 	
 	smlTrace(TRACE_EXIT, "%s", __func__);
 	return TRUE;
-
 error:
 	if (buffer)
 		smlSafeCFree(&buffer);
-	smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
+	smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, (*error)->message);
 	return FALSE;
 }
 
-SmlXmlParser *smlWbxmlParserNew(SmlParserFunctions *functions, SmlError **error)
+SmlXmlParser*
+smlWbxmlParserNew (SmlParserFunctions *functions,
+                   GError **error)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %p)", __func__, functions, error);
 	CHECK_ERROR_REF
@@ -129,13 +145,19 @@
 	
 	smlTrace(TRACE_EXIT, "%s: %p", __func__, parser);
 	return parser;
-
 error:
-	smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
+	smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, (*error)->message);
 	return NULL;
 }
 
-SmlBool smlWbxmlAssemblerRun(SmlXmlAssembler *assm, char **data, unsigned int *size, SmlBool *end, SmlBool final, unsigned int maxsize, SmlError **error)
+gboolean
+smlWbxmlAssemblerRun (SmlXmlAssembler *assm,
+                      gchar **data,
+                      gsize *size,
+                      gboolean *end,
+                      gboolean final,
+                      gsize maxsize,
+                      GError **error)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %p, %p, %p, %i, %i, %p)", __func__, assm, data, size, end, final, maxsize, error);
 	CHECK_ERROR_REF
@@ -164,15 +186,17 @@
 	
 	smlTrace(TRACE_EXIT, "%s", __func__);
 	return TRUE;
-
 error:
 	if (buffer)
 		smlSafeCFree(&buffer);
-	smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
+	smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, (*error)->message);
 	return FALSE;
 }
 
-unsigned int smlWbxmlAssemblerCheckSize(SmlXmlAssembler *assm, SmlBool headeronly, SmlError **error)
+gsize
+smlWbxmlAssemblerCheckSize (SmlXmlAssembler *assm,
+                            gboolean headeronly,
+                            GError **error)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %i, %p)", __func__, assm, headeronly, error);
 	CHECK_ERROR_REF
@@ -190,18 +214,17 @@
 	if (opt && atoi(opt))
 		params.use_strtbl = TRUE;
 	if (!smlWbxmlConvertTo(&params, buffer, &data, &size, error))
-		goto error_free_buffer;
+		goto error;
 	
 	smlSafeCFree(&data);
 	smlSafeCFree(&buffer);
 	
 	smlTrace(TRACE_EXIT, "%s: %i", __func__, size);
 	return size;
-
-error_free_buffer:
-	smlSafeCFree(&buffer);
 error:
-	smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
+	if (buffer)
+		smlSafeCFree(&buffer);
+	smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, (*error)->message);
 	return 0;
 }
 
@@ -212,7 +235,10 @@
  * @return The new assembler or NULL in the case of an error
  * 
  */
-SmlXmlAssembler *smlWbxmlAssemblerNew(SmlAssembler *assembler, SmlAssemblerFunctions *functions, SmlError **error)
+SmlXmlAssembler*
+smlWbxmlAssemblerNew (SmlAssembler *assembler,
+                      SmlAssemblerFunctions *functions,
+                      GError **error)
 {
 	smlTrace(TRACE_ENTRY, "%s(%p, %p, %p)", __func__, assembler, functions, error);
 	CHECK_ERROR_REF
@@ -226,9 +252,8 @@
 	
 	smlTrace(TRACE_EXIT, "%s: %p", __func__, assm);
 	return assm;
-	
 error:
-	smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, smlErrorPrint(error));
+	smlTrace(TRACE_EXIT_ERROR, "%s: %s", __func__, (*error)->message);
 	return NULL;
 }
 

Modified: trunk/libsyncml/parser/sml_wbxml.h
==============================================================================
--- trunk/libsyncml/parser/sml_wbxml.h	Wed Jul  8 12:22:14 2009	(r1157)
+++ trunk/libsyncml/parser/sml_wbxml.h	Wed Jul  8 16:18:21 2009	(r1158)
@@ -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
@@ -29,8 +30,8 @@
 #ifndef _SML_WBXML_H_
 #define _SML_WBXML_H_
 
-SmlXmlParser *smlWbxmlParserNew(SmlParserFunctions *functions, GError **error);
-SmlXmlAssembler *smlWbxmlAssemblerNew(SmlAssembler *assembler, SmlAssemblerFunctions *functions, GError **error);
+SmlXmlParser*    smlWbxmlParserNew    (SmlParserFunctions *functions, GError **error);
+SmlXmlAssembler* smlWbxmlAssemblerNew (SmlAssembler *assembler, SmlAssemblerFunctions *functions, GError **error);
 
 #endif //_SML_WBXML_H_
 /*@}*/

Modified: trunk/libsyncml/parser/sml_wbxml_internals.h
==============================================================================
--- trunk/libsyncml/parser/sml_wbxml_internals.h	Wed Jul  8 12:22:14 2009	(r1157)
+++ trunk/libsyncml/parser/sml_wbxml_internals.h	Wed Jul  8 16:18:21 2009	(r1158)
@@ -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
@@ -31,8 +32,8 @@
 
 #include <wbxml.h>
 
-SmlBool smlWbxmlConvertTo(WBXMLConvXML2WBXMLParams *params, const char *input, char **output, size_t *outputLen, SmlError** error);
-SmlBool smlWbxmlConvertFrom(WBXMLConvWBXML2XMLParams *params, const char *input, size_t inputLen, char **output, size_t *outputLen, SmlError** error);
+gboolean smlWbxmlConvertTo   (WBXMLConvXML2WBXMLParams *params, const gchar *input, gchar **output, gsize *outputLen, GError** error);
+gboolean smlWbxmlConvertFrom (WBXMLConvWBXML2XMLParams *params, const gchar *input, gsize inputLen, gchar **output, gsize *outputLen, GError** error);
 
 #endif //_SML_WBXML_INTERNALS_H_
 /*@}*/

Modified: trunk/libsyncml/parser/sml_xml_assm.h
==============================================================================
--- trunk/libsyncml/parser/sml_xml_assm.h	Wed Jul  8 12:22:14 2009	(r1157)
+++ trunk/libsyncml/parser/sml_xml_assm.h	Wed Jul  8 16:18:21 2009	(r1158)
@@ -1,7 +1,7 @@
 /*
  * libsyncml - A syncml protocol implementation
  * Copyright (C) 2005  Armin Bauer <arm...@op...>
- * Copyright (C) 2008  Michael Bell <mic...@op...>
+ * Copyright (C) 2008-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
@@ -32,27 +32,23 @@
 
 typedef struct SmlXmlAssembler SmlXmlAssembler;
 
-SmlXmlAssembler *smlXmlAssemblerNew(SmlAssembler *assembler, SmlAssemblerFunctions *functions, GError **error);
+SmlXmlAssembler* smlXmlAssemblerNew (SmlAssembler *assembler, SmlAssemblerFunctions *functions, GError **error);
 
-SmlBool smlXmlAssemblerAddHeader(SmlXmlAssembler *assembler, SmlSession *session, SmlError **error);
-// FIXME: not yet implemented
-// SmlBool smlXmlAssemblerAddCommand(SmlXmlAssembler *assembler, SmlCommand *cmd, SmlError **error);
-SmlBool smlXmlAssemblerAddStatus(SmlXmlAssembler *assembler, SmlStatus *status, SmlError **error);
-void smlXmlAssemblerFree(SmlXmlAssembler *assm);
-// FIXME: not yet implemented
-// void smlXmlAssemblerClean(SmlXmlAssembler *assm);
-SmlBool smlXmlAssemblerStart(SmlXmlAssembler *assm, SmlSession *session, SmlError **error);
-SmlBool smlXmlAssemblerEnd(SmlXmlAssembler *assm, SmlError **error);
-SmlBool smlXmlAssemblerRun(SmlXmlAssembler *assm, char **data, unsigned int *size, SmlBool *end, SmlBool final, unsigned int maxsize, SmlError **error);
-SmlBool smlXmlAssemblerRunFull(SmlXmlAssembler *assm, char **data, unsigned int *size, SmlBool *end, SmlBool final, SmlBool check, unsigned int maxsize, SmlError **error);
+gboolean smlXmlAssemblerAddHeader (SmlXmlAssembler *assembler, SmlSession *session, GError **error);
+gboolean smlXmlAssemblerAddStatus (SmlXmlAssembler *assembler, SmlStatus *status, GError **error);
+void     smlXmlAssemblerFree      (SmlXmlAssembler *assm);
+gboolean smlXmlAssemblerStart     (SmlXmlAssembler *assm, SmlSession *session, GError **error);
+gboolean smlXmlAssemblerEnd       (SmlXmlAssembler *assm, GError **error);
+gboolean smlXmlAssemblerRun       (SmlXmlAssembler *assm, gchar **data, gsize *size, gboolean *end, gboolean final, gsize maxsize, GError **error);
+gboolean smlXmlAssemblerRunFull   (SmlXmlAssembler *assm, char **data, unsigned int *size, gboolean *end, gboolean final, gboolean check, gsize maxsize, GError **error);
 
-SmlBool smlXmlDevInfAssemble(SmlDevInf *devinf, SmlDevInfVersion version, char **data, unsigned int *size, GError **error);
+gboolean smlXmlDevInfAssemble (SmlDevInf *devinf, SmlDevInfVersion version, gchar **data, gsize *size, GError **error);
 
 /* This is necessary if the first message results in an error 407.
  * This error means authentication required.
  * After such an error the previous commands must be sent again.
  */
-void smlXmlAssemblerRestoreCommands(SmlXmlAssembler *assm);
+void smlXmlAssemblerRestoreCommands (SmlXmlAssembler *assm);
 
 #endif //_SML_XML_ASSM_H_
 /*@}*/