Merge branch 'master' of gitlab.com:gambas/gambas

This commit is contained in:
gambas 2017-08-17 17:10:28 +02:00
commit e5d1ec1c9a
5 changed files with 11 additions and 11 deletions

View file

@ -47,7 +47,7 @@ Document* XMLDocument_New()
}
Document* XMLDocument_NewFromFile(const char *fileName, const size_t lenFileName, const DocumentType docType) throw(XMLParseException)
Document* XMLDocument_NewFromFile(const char *fileName, const size_t lenFileName, const DocumentType docType)
{
Document *newDoc = (Document*)malloc(sizeof(Document));
@ -91,7 +91,7 @@ void XMLDocument_SetRoot(Document *doc, Element *newRoot)
}
/***** Document loading *****/
void XMLDocument_Open(Document *doc, const char *fileName, const size_t lenFileName) throw(XMLParseException)
void XMLDocument_Open(Document *doc, const char *fileName, const size_t lenFileName)
{
char *content; int len;
@ -107,7 +107,7 @@ void XMLDocument_Open(Document *doc, const char *fileName, const size_t lenFileN
}
void XMLDocument_SetContent(Document *doc, const char *content, const size_t len) throw(XMLParseException)
void XMLDocument_SetContent(Document *doc, const char *content, const size_t len)
{
char *posStart = 0, *posEnd = 0;

View file

@ -26,11 +26,11 @@
#include "utils.h"
Document* XMLDocument_New();
Document* XMLDocument_NewFromFile(const char *fileName, const size_t lenFileName, const DocumentType docType = XMLDocumentType) throw(XMLParseException);
Document* XMLDocument_NewFromFile(const char *fileName, const size_t lenFileName, const DocumentType docType = XMLDocumentType);
void XMLDocument_Release(Document *doc);
void XMLDocument_Open(Document *doc, const char *fileName, const size_t lenFileName) throw(XMLParseException);
void XMLDocument_SetContent(Document *doc, const char *content, const size_t len) throw(XMLParseException);
void XMLDocument_Open(Document *doc, const char *fileName, const size_t lenFileName);
void XMLDocument_SetContent(Document *doc, const char *content, const size_t len);
void XMLDocument_Save(Document *doc, const char *fileName, bool indent = false);
void XMLDocument_SetRoot(Document *doc, Element *newRoot);

View file

@ -23,7 +23,7 @@ void GBparse(const char *data, const size_t lendata, GB_ARRAY *array, DocumentTy
GBparseXML(data, lendata, array);
}
Node** parse(char const *data, const size_t lendata, size_t *nodeCount, DocumentType docType) throw(XMLParseException)
Node** parse(char const *data, const size_t lendata, size_t *nodeCount, DocumentType docType)
{
if(docType == HTMLDocumentType || docType == XHTMLDocumentType)
{
@ -75,7 +75,7 @@ void parser_cleanup(Node **elements, size_t *nodeCount)
#define THROW(_ex) parser_cleanup(elements, nodeCount); throw(_ex)
Node** parseXML(char const *data, const size_t lendata, size_t *nodeCount) throw(XMLParseException)
Node** parseXML(char const *data, const size_t lendata, size_t *nodeCount)
{
*nodeCount = 0;
if(!lendata || !data) return 0; //Empty ?

View file

@ -5,10 +5,10 @@
#include "utils.h"
void GBparse(const char *data, const size_t lendata, GB_ARRAY *array, DocumentType docType);
Node** parse(char const *data, const size_t lendata, size_t *nodeCount, DocumentType docType) throw(XMLParseException);
Node** parse(char const *data, const size_t lendata, size_t *nodeCount, DocumentType docType);
void GBparseXML(char const *data, const size_t lendata, GB_ARRAY *array);
Node** parseXML(char const *data, const size_t lendata, size_t *nodeCount) throw(XMLParseException);
Node** parseXML(char const *data, const size_t lendata, size_t *nodeCount);
#endif // PARSER_H

View file

@ -36,7 +36,7 @@ extern XML_INTERFACE XML;
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>
void XSLT_Transform(Document* doc, Document* stylesheet,char* &outDocument, size_t &outDocumentLen) throw(XSLTException)
void XSLT_Transform(Document* doc, Document* stylesheet,char* &outDocument, size_t &outDocumentLen)
{
if(!doc->childCount) throw XSLTException("Void document");
if(!stylesheet->childCount) throw XSLTException("Void style sheet");