Commit 70a9da54 authored by Bjorn Reese's avatar Bjorn Reese
Browse files

trio upgrade and integration

parent 34b1b3a8
Sat Apr 21 18:27:51 CEST 2001 Bjorn Reese <breese@users.sourceforge.net>
* libxml.h: new header used only for the compilation of libxml
* HTMLparser.c HTMLtree.c SAX.c debugXML.c encoding.c entities.c
error.c hash.c list.c nanoftp.c nanohttp.c parser.c
parserInternals.c testHTML.c testSAX.c testURI.c testXPath.c
tree.c uri.c valid.c xinclude.c xlink.c xmlIO.c xmllint.c
xmlmemory.c xpath.c xpointer.c: libxml.h integration
* trio.[ch] triop.h strio.[ch]: upgraded to the latest trio
baseline (version 1.2 plus a single patch).
* xpath.c result/XPath/expr/floats test/XPath/expr/floats: parses
scientific notation for numbers. Tests added.
* xpath.c: formatting of numbers changed to use sprintf
(contribution from William Brack)
Sat Apr 21 16:12:59 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* valid.c: cleanup, more useful debugging
......
......@@ -6,15 +6,9 @@
* Daniel.Veillard@w3.org
*/
#ifdef WIN32
#include "win32config.h"
#else
#include "config.h"
#endif
#include <libxml/xmlversion.h>
#include "libxml.h"
#ifdef LIBXML_HTML_ENABLED
#include <stdio.h>
#include <string.h>
#ifdef HAVE_CTYPE_H
#include <ctype.h>
......
......@@ -7,16 +7,9 @@
*/
#ifdef WIN32
#include "win32config.h"
#else
#include "config.h"
#endif
#include <libxml/xmlversion.h>
#include "libxml.h"
#ifdef LIBXML_HTML_ENABLED
#include <stdio.h>
#include <string.h> /* for memset() only ! */
#ifdef HAVE_CTYPE_H
......
......@@ -7,12 +7,7 @@
*/
#ifdef WIN32
#include "win32config.h"
#else
#include "config.h"
#endif
#include <stdio.h>
#include "libxml.h"
#include <stdlib.h>
#include <string.h>
#include <libxml/xmlmemory.h>
......
......@@ -7,16 +7,9 @@
* Daniel Veillard <Daniel.Veillard@w3.org>
*/
#ifdef WIN32
#include "win32config.h"
#else
#include "config.h"
#endif
#include <libxml/xmlversion.h>
#include "libxml.h"
#ifdef LIBXML_DEBUG_ENABLED
#include <stdio.h>
#include <string.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
......
......@@ -20,13 +20,8 @@
* Daniel.Veillard@w3.org
*/
#ifdef WIN32
#include "win32config.h"
#else
#include "config.h"
#endif
#include "libxml.h"
#include <stdio.h>
#include <string.h>
#ifdef HAVE_CTYPE_H
......@@ -35,7 +30,6 @@
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
#include <libxml/xmlversion.h>
#ifdef LIBXML_ICONV_ENABLED
#ifdef HAVE_ERRNO_H
#include <errno.h>
......
......@@ -6,13 +6,8 @@
* Daniel.Veillard@w3.org
*/
#ifdef WIN32
#include "win32config.h"
#else
#include "config.h"
#endif
#include "libxml.h"
#include <stdio.h>
#include <string.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
......
......@@ -6,13 +6,8 @@
* Daniel Veillard <Daniel.Veillard@w3.org>
*/
#ifdef WIN32
#include "win32config.h"
#else
#include "config.h"
#endif
#include "libxml.h"
#include <stdio.h>
#include <stdarg.h>
#include <libxml/parser.h>
#include <libxml/xmlerror.h>
......
......@@ -14,14 +14,10 @@
* MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
* CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
*
* Author: bjorn.reese@systematic.dk
* Author: breese@users.sourceforge.net
*/
#ifdef WIN32
#include "win32config.h"
#else
#include "config.h"
#endif
#include "libxml.h"
#include <string.h>
#include <libxml/hash.h>
......
/*
* libxml.h: internal header only used during the compilation of libxml
*
* See COPYRIGHT for the status of this software
*
* Author: breese@users.sourceforge.net
*/
#ifndef __XML_LIBXML_H__
#define __XML_LIBXML_H__
#ifdef WIN32
#include "win32config.h"
#else
#include "config.h"
#endif
#include <libxml/xmlversion.h>
#ifdef WITHOUT_TRIO
#include <stdio.h>
#else
#define TRIO_REPLACE_STDIO
#include "trio.h"
#endif
#endif /* ! __XML_LIBXML_H__ */
......@@ -15,11 +15,7 @@
* Author: Gary.Pennington@uk.sun.com
*/
#ifdef WIN32
#include "win32config.h"
#else
#include "config.h"
#endif
#include "libxml.h"
#include <stdlib.h>
#include <string.h>
......
......@@ -12,19 +12,19 @@
#define HAVE_NETINET_IN_H
#define HAVE_NETDB_H
#define HAVE_SYS_TIME_H
#else /* STANDALONE */
#ifdef WIN32
#define INCLUDE_WINSOCK
#include "win32config.h"
#include <libxml/xmlversion.h>
#ifdef WITHOUT_TRIO
#include <stdio.h>
#else
#include "config.h"
#define TRIO_REPLACE_STDIO
#include "trio.h"
#endif
#else /* STANDALONE */
#include "libxml.h"
#endif /* STANDALONE */
#include <libxml/xmlversion.h>
#ifdef LIBXML_FTP_ENABLED
#include <stdio.h>
#include <string.h>
#ifdef HAVE_STDLIB_H
......
......@@ -14,17 +14,9 @@
/* TODO add compression support, Send the Accept- , and decompress on the
fly with ZLIB if found at compile-time */
#ifdef WIN32
#define INCLUDE_WINSOCK
#include "win32config.h"
#else
#include "config.h"
#endif
#include <libxml/xmlversion.h>
#include "libxml.h"
#ifdef LIBXML_HTTP_ENABLED
#include <stdio.h>
#include <string.h>
#ifdef HAVE_STDLIB_H
......
......@@ -33,15 +33,14 @@
* and xmlDoValidityCheckingDefaultValue for VMS
*/
#include "libxml.h"
#ifdef WIN32
#include "win32config.h"
#define XML_DIR_SEP '\\'
#else
#include "config.h"
#define XML_DIR_SEP '/'
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <libxml/xmlmemory.h>
......
......@@ -7,15 +7,14 @@
* Daniel.Veillard@w3.org
*/
#include "libxml.h"
#ifdef WIN32
#include "win32config.h"
#define XML_DIR_SEP '\\'
#else
#include "config.h"
#define XML_DIR_SEP '/'
#endif
#include <stdio.h>
#include <string.h>
#ifdef HAVE_CTYPE_H
#include <ctype.h>
......
......@@ -15,6 +15,14 @@ Object is a number : 1.23
Expression: 0.123
Object is a number : 0.123
========================
Expression: 1.23e3
Object is a number : 1230
========================
Expression: 1.23e-3
Object is a number : 0.00123
========================
Expression: 1 div 0
Object is a number : inf
......
......@@ -15,12 +15,9 @@
*
************************************************************************/
/* DV for libxml */
#include <libxml/xmlversion.h>
#ifdef WITH_TRIO
/* FIXME
* StrToLongDouble
/*
* TODO
* - StrToLongDouble
*/
static const char rcsid[] = "@(#)$Id$";
......@@ -389,9 +386,9 @@ char *StrSubstringMax(const char *string, size_t max, const char *find)
assert(VALID(find));
size = StrLength(find);
if (size >= max)
if (size <= max)
{
for (count = 0; count > max - size; count++)
for (count = 0; count <= max - size; count++)
{
if (StrEqualMax(find, size, &string[count]))
{
......@@ -563,6 +560,3 @@ int StrToUpper(char *target)
}
return i;
}
/* DV for libxml */
#endif /* WITH_TRIO */
......@@ -15,13 +15,16 @@
*
************************************************************************/
#ifndef H_STRIO
#define H_STRIO
#ifndef TRIO_STRIO_H
#define TRIO_STRIO_H
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include "assert.h"
#ifndef DEBUG
# define NDEBUG
#endif
#include <assert.h>
/*
* StrAppend(target, source)
......@@ -122,7 +125,7 @@
enum {
STRIO_HASH_NONE = 0,
STRIO_HASH_PLAIN,
STRIO_HASH_TWOSIGNED
STRIO_HASH_TWOSIGNED,
};
#if !defined(DEBUG) || defined(__DECC)
......@@ -213,4 +216,4 @@ float StrToFloat(const char *source, const char **target);
double StrToDouble(const char *source, const char **target);
int StrToUpper(char *target);
#endif /* H_STRIO */
#endif /* TRIO_STRIO_H */
......@@ -2,6 +2,8 @@
123
1.23
0.123
1.23e3
1.23e-3
1 div 0
-1 div 0
0 div 0
......
......@@ -6,17 +6,14 @@
* Daniel.Veillard@w3.org
*/
#include "libxml.h"
#ifdef LIBXML_HTML_ENABLED
#ifdef WIN32
#include "win32config.h"
#undef LIBXML_DLL_IMPORT
#else
#include "config.h"
#endif
#include <libxml/xmlversion.h>
#ifdef LIBXML_HTML_ENABLED
#include <stdio.h>
#include <string.h>
#include <stdarg.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment