HTArray.h   HTArray.h 
skipping to change at line 97 skipping to change at line 97
extern BOOL HTArray_addObject (HTArray * array, void * object); extern BOOL HTArray_addObject (HTArray * array, void * object);
/* /*
.Traverse an Array. .Traverse an Array.
Fast macros to traverse a macro ending in a NULL element. Fast macros to traverse a macro ending in a NULL element.
*/ */
#define HTArray_firstObject(me, data) \ #define HTArray_firstObject(me, dp) \
((me) && ((data)=(me)->data) ? *(data)++ : NULL) ((me) && ((dp)=(me)->data) ? *(dp)++ : NULL)
#define HTArray_nextObject(me, data) \ #define HTArray_nextObject(me, dp) \
((me) && (data) ? *(data)++ : NULL) ((me) && (dp) ? *(dp)++ : NULL)
/* /*
.Sort an Array. .Sort an Array.
An array can be sorted in any way you like, for example with An array can be sorted in any way you like, for example with
qsort(). This module provides an easy interface to the qsort() qsort(). This module provides an easy interface to the qsort()
function using where you can define you own comparison routine as a function using where you can define you own comparison routine as a
function of the type: function of the type:
skipping to change at line 151 skipping to change at line 151
#define HTArray_size(me) ((me) ? (me)->size : -1) #define HTArray_size(me) ((me) ? (me)->size : -1)
/* /*
*/ */
#endif #endif
/* /*
@(#) $Id: HTArray.html,v 2.7 1998/05/14 02:10:14 frystyk Exp $ @(#) $Id: HTArray.html,v 2.8 2000/08/07 10:38:05 kahan Exp $
*/ */
 End of changes. 2 change blocks. 
5 lines changed or deleted 5 lines changed or added


 HTChunk.h   HTChunk.h 
skipping to change at line 19 skipping to change at line 19
/* /*
** (c) COPYRIGHT MIT 1995. ** (c) COPYRIGHT MIT 1995.
** Please first read the full copyright statement in the file COPYRIGH. ** Please first read the full copyright statement in the file COPYRIGH.
*/ */
/* /*
The Chunk Class defines a way to automatically handle dynamic strings and The Chunk Class defines a way to automatically handle dynamic strings and
other data types. You create a chunk with an initial size and it will then other data types. You create a chunk with an initial size and it will then
automatically grow to accomodate added data to the chunk. It is a general automatically grow to accommodate added data to the chunk. It is a general
utility module. It is garanteed that the array is '\0' terminated utility module. It is guaranteed that the array is '\0' terminated
at all times (and hence is a valid C type string). The method at all times (and hence is a valid C type string). The method
HTChunkTerminate can be used to explicitly HTChunkTerminate can be used to explicitly
add a terminating '\0' and then to include this character in add a terminating '\0' and then to include this character in
the chunk size. If left out, the terminating character is not considered the chunk size. If left out, the terminating character is not considered
part of the chunk. part of the chunk.
Note: The names without a "_" (made as a #define's) are Note: The names without a "_" (made as a #define's) are
only provided for backwards compatibility and should not be used. only provided for backwards compatibility and should not be used.
This module is implemented by HTChunk.c, and it is This module is implemented by HTChunk.c, and it is
skipping to change at line 69 skipping to change at line 69
extern void HTChunk_delete (HTChunk * ch); extern void HTChunk_delete (HTChunk * ch);
/* /*
. .
Clear a chunk Clear a chunk
. .
Keep the chunk in memory but clear all data kept inside. This can be used Keep the chunk in memory but clear all data kept inside. This can be used
if you know that you can reuse the allocated memory instead of allocating if you know that you can reuse the allocated memory instead of allocating
new memory. new memory. This zeros out all the allocated data (even data past the
indicated size) and sets the size of the chunk to 0. If you have not used
any bytes past the indicated size, it is more efficient to truncate the
chunk to 0 instead.
*/ */
extern void HTChunk_clear (HTChunk * ch); extern void HTChunk_clear (HTChunk * ch);
/* /*
. .
Ensure a Chunk has a Certain Amount of Free Space Ensure a Chunk has a Certain Amount of Free Space
. .
Make sure that a chunk has a certain size. If this is not the case then the Make sure that a chunk has enough memory allocated to grow by the
chunk is expanded. Nothing is done if the current size if bigger than the indicated extra size. If this is not the case, then the chunk is expanded
size requested. (in multiples of the chunk's "growby" size). Nothing is done if the
current size plus the requested extra space fits within the chunk's
currently allocated memory.
*/ */
extern void HTChunk_ensure (HTChunk * ch, int s); extern void HTChunk_ensure (HTChunk * ch, int extra_size);
/* /*
. .
Append a character to a chunk Append a character to a chunk
. .
Add the character and increment the size of the chunk by one character Add the character and increment the size of the chunk by one character
*/ */
extern void HTChunk_putc (HTChunk * ch, char c); extern void HTChunk_putc (HTChunk * ch, char c);
skipping to change at line 140 skipping to change at line 145
Return Current Size Return Current Size
. .
Returns the current size of the chunk Returns the current size of the chunk
*/ */
extern int HTChunk_size (HTChunk * ch); extern int HTChunk_size (HTChunk * ch);
/* /*
. .
Truncate Chunk Setting the Size of a Chunk
. .
If for some reason you want to cut off a piece of a chunk then you can If you want to cut off a piece of a chunk or extend it to make room
use this function. It sets the size of the chunk to be for some direct buffer manipulation, then you can use one of these
position. Clearing the chunk is equivalent to a position functions. Both of these calls set the size of the chunk to be
of 0. size, but the truncate call only allows you to make the
string shorter. If the string is made shorter, the formerly-used bytes
are cleared, so truncating a chunk to 0 is analogous to clearing it,
but slightly more efficient.
*/ */
extern BOOL HTChunk_truncate (HTChunk * ch, int position); extern BOOL HTChunk_truncate (HTChunk * ch, int size);
extern BOOL HTChunk_setSize (HTChunk * ch, int size);
/* /*
. .
Zero Terminate a chunk Zero Terminate a chunk
. .
As a chunk often is a dynamic string, it needs to be terminated by a zero As a chunk often is a dynamic string, it needs to be terminated by a zero
in order to be used in C. However, by default any chunk is in order to be used in C. However, by default any chunk is
always zero terminated, so the only purpose of this function is to always zero terminated, so the only purpose of this function is to
increment the size counter with one corresponding to the zero. increment the size counter with one corresponding to the zero.
*/ */
extern void HTChunk_terminate (HTChunk * ch); extern void HTChunk_terminate (HTChunk * ch);
/* /*
. .
CString Conversions CString Conversions
. .
A Chunk may be built from an allocated string. The chunk assumes control A Chunk may be built from an allocated string. The chunk assumes control
of the passed string, elminating the need for additional allocations and of the passed string, eliminating the need for additional allocations and
string copies. string copies.
Once a string is built, the chunk may be destroyed and the string kept arou nd. When you take control of the CString from a chunk, the chunk is destroyed.
*/ */
extern HTChunk * HTChunk_fromCString (char * str, int grow); extern HTChunk * HTChunk_fromCString (char * str, int grow);
extern char * HTChunk_toCString (HTChunk * ch); extern char * HTChunk_toCString (HTChunk * ch);
/* /*
. .
Creating a Chunk from an allocated buffer
.
A Chunk may be built from an allocted buffer. You must specify how much
memory is allocated in the buffer (buflen) and what the size the new
Chunk should be (size). All memory between size and buflen is zeroed.
Note that is is legal to specify a size equal to the buflen if you don't
expect the Chunk to be null terminated. The chunk takes control of the
memory, and will free it when the Chunk is destroyed. Note that in order
to avoid conflicts, the buffer's memory should be allocated using
libwww's dedicated functions.
*/
extern HTChunk * HTChunk_fromBuffer (char * buf, int buflen, int size, int
grow);
/*
.
Old Interface Names Old Interface Names
. .
Don't use these in new applications Don't use these in new applications
*/ */
#define HTChunkCreate(growby) HTChunk_new(growby) #define HTChunkCreate(growby) HTChunk_new(growby)
#define HTChunkFree(ch) HTChunk_delete(ch) #define HTChunkFree(ch) HTChunk_delete(ch)
#define HTChunkClear(ch) HTChunk_clear(ch) #define HTChunkClear(ch) HTChunk_clear(ch)
#define HTChunkEnsure(ch, s) HTChunk_ensure((ch), (s)) #define HTChunkEnsure(ch, s) HTChunk_ensure((ch), (s))
skipping to change at line 203 skipping to change at line 229
#define HTChunkData(ch) HTChunk_data(ch) #define HTChunkData(ch) HTChunk_data(ch)
#define HTChunkSize(ch) HTChunk_size(ch) #define HTChunkSize(ch) HTChunk_size(ch)
/* /*
*/ */
#endif #endif
/* /*
@(#) $Id: HTChunk.html,v 2.37 2000/07/04 15:26:00 kahan Exp $ @(#) $Id: HTChunk.html,v 2.39 2000/09/01 13:47:14 kahan Exp $
*/ */
 End of changes. 11 change blocks. 
16 lines changed or deleted 43 lines changed or added


 HTFormat.h   HTFormat.h 
skipping to change at line 180 skipping to change at line 180
#define WWW_PLAINTEXT HTAtom_for("text/plain") #define WWW_PLAINTEXT HTAtom_for("text/plain")
#define WWW_FORM HTAtom_for("application/x-www-form-urlencoded") #define WWW_FORM HTAtom_for("application/x-www-form-urlencoded")
#define WWW_MIME HTAtom_for("message/rfc822") #define WWW_MIME HTAtom_for("message/rfc822")
#define WWW_MIME_HEAD HTAtom_for("message/x-rfc822-head") #define WWW_MIME_HEAD HTAtom_for("message/x-rfc822-head")
#define WWW_MIME_FOOT HTAtom_for("message/x-rfc822-foot") #define WWW_MIME_FOOT HTAtom_for("message/x-rfc822-foot")
#define WWW_MIME_PART HTAtom_for("message/x-rfc822-partial") #define WWW_MIME_PART HTAtom_for("message/x-rfc822-partial")
#define WWW_MIME_CONT HTAtom_for("message/x-rfc822-cont") #define WWW_MIME_CONT HTAtom_for("message/x-rfc822-cont")
#define WWW_MIME_UPGRADE HTAtom_for("message/x-rfc822-upgrade") #define WWW_MIME_UPGRADE HTAtom_for("message/x-rfc822-upgrade")
#define WWW_MIME_COPYHEADERS HTAtom_for("www/x-rfc822-headers")
#define WWW_AUDIO HTAtom_for("audio/basic") #define WWW_AUDIO HTAtom_for("audio/basic")
#define WWW_VIDEO HTAtom_for("video/mpeg") #define WWW_VIDEO HTAtom_for("video/mpeg")
#define WWW_GIF HTAtom_for("image/gif") #define WWW_GIF HTAtom_for("image/gif")
#define WWW_JPEG HTAtom_for("image/jpeg") #define WWW_JPEG HTAtom_for("image/jpeg")
#define WWW_TIFF HTAtom_for("image/tiff") #define WWW_TIFF HTAtom_for("image/tiff")
#define WWW_PNG HTAtom_for("image/png") #define WWW_PNG HTAtom_for("image/png")
#define WWW_BINARY HTAtom_for("application/octet-stream") #define WWW_BINARY HTAtom_for("application/octet-stream")
skipping to change at line 755 skipping to change at line 757
double secs_per_byte; double secs_per_byte;
} HTPresentation; } HTPresentation;
/* /*
*/ */
#endif /* HTFORMAT */ #endif /* HTFORMAT */
/* /*
@(#) $Id: HTFormat.html,v 2.84 1999/02/27 01:28:40 frystyk Exp $ @(#) $Id: HTFormat.html,v 2.85 2000/12/18 17:00:56 kahan Exp $
*/ */
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added


 HTHash.h   HTHash.h 
skipping to change at line 56 skipping to change at line 56
extern HTHashtable * HTHashtable_new (int size); extern HTHashtable * HTHashtable_new (int size);
extern BOOL HTHashtable_delete (HTHashtable *me); extern BOOL HTHashtable_delete (HTHashtable *me);
/* /*
. .
Add an Element to a HashTable Add an Element to a HashTable
. .
*/ */
extern BOOL HTHashtable_addObject (HTHashtable *me, const char *key , void extern BOOL HTHashtable_addObject (HTHashtable *me, const char *key, void *
*newObject); newObject);
/*
.
Remove an Element from a HashTable
.
*/
extern BOOL HTHashtable_removeObject (HTHashtable *me, const char *key);
/* /*
. .
Search for an Element in a Hash Table Search for an Element in a Hash Table
. .
*/ */
extern void * HTHashtable_object (HTHashtable * me, const char *key); extern void * HTHashtable_object (HTHashtable * me, const char *key);
/* /*
. .
Size of a Hash Table Size of a Hash Table
. .
*/ */
extern int HTHashtable_count (HTHashtable *me); extern int HTHashtable_count (HTHashtable *me);
/* /*
. .
Walk all the elements in a Hash Table
.
Walking the hashtable calls the specified function pointer with each key
and object that is in the hash table. If the callback function returns 0,
the walking stops. If it returns a negative number, the current element
is removed from the hash table. Return a positive number to keep going.
Note that it is legal for the walkFunc to call HTHashtable_removeObject()
on any element in the current hash table except the current
one (if you intend to keep going, that is). The only legal way to delete t
he
current element while continuing to walk the table is to use the negative
return value.
*/
extern BOOL HTHashtable_walk (HTHashtable *me, int (*walkFunc)(HTHashtab
le *, char *, void *));
/*
.
Extract in a dynamic array all keys of the Hash Table Extract in a dynamic array all keys of the Hash Table
. .
*/ */
extern HTArray * HTHashtable_keys (HTHashtable *me); extern HTArray * HTHashtable_keys (HTHashtable *me);
/* /*
. .
Print the keys of the Hash Table Print the keys of the Hash Table
. .
skipping to change at line 97 skipping to change at line 124
extern void HTHashtable_print (HTHashtable *me); extern void HTHashtable_print (HTHashtable *me);
/* /*
*/ */
#endif #endif
/* /*
@(#) $Id: HTHash.html,v 1.1 1999/04/18 20:20:35 frystyk Exp $ @(#) $Id: HTHash.html,v 1.2 2000/08/11 07:49:07 kahan Exp $
*/ */
 End of changes. 3 change blocks. 
3 lines changed or deleted 32 lines changed or added


 HTMIME.h   HTMIME.h 
skipping to change at line 138 skipping to change at line 138
Response. This response must be appended to the already existing cache entr y Response. This response must be appended to the already existing cache entr y
before presented to the user. That is, first we load the before presented to the user. That is, first we load the
cached object and pump it down the pipe and then cached object and pump it down the pipe and then
the new data follows. Only the latter part gets appended to the cache, of the new data follows. Only the latter part gets appended to the cache, of
course. course.
*/ */
extern HTConverter HTMIMEPartial; extern HTConverter HTMIMEPartial;
/* /*
.
HTMIME_anchor2response
.
Copies the anchor HTTP headers into a response object by means
of the generic _dispatchParsers function. Written so that we can
copy the HTTP headers stored in the cache to the response object.
*/
#ifndef NO_CACHE
extern HTConverter HTCacheCopyHeaders;
#endif
/*
*/ */
#endif #endif
/* /*
@(#) $Id: HTMIME.html,v 2.30 1999/02/27 16:12:14 frystyk Exp $ @(#) $Id: HTMIME.html,v 2.32 2000/12/18 17:00:56 kahan Exp $
*/ */
 End of changes. 2 change blocks. 
1 lines changed or deleted 15 lines changed or added


 HTRDF.h   HTRDF.h 
skipping to change at line 448 skipping to change at line 448
) )
This stream converter converts an RDF stream to triples and sends them down strem This stream converter converts an RDF stream to triples and sends them down strem
as (predicate, subject, object). This can for example be used to as (predicate, subject, object). This can for example be used to
print them out to stdout etc. print them out to stdout etc.
*/ */
extern HTConverter HTRDFToTriples; extern HTConverter HTRDFToTriples;
/* /*
(
Parse a file of RDF
)
This function parses a file of RDF in a synchronous, non-blocking
way. In other words, the file is not asynchronously loaded.
If new_triple_callback is NULL, the default triple handler is
invoked. The context pointer will be available in the triple
callback function.
Returns YES if the file is successfully parsed; otherwise NO is
returned and an error message is logged.
*/
extern BOOL HTRDF_parseFile (const char *file_name,
HTTripleCallback_new * new_triple_callback,
void *context);
/*
(
Parse a buffer of RDF
)
This function parses a buffer of RDF in a synchronous, non-blocking way.
If new_triple_callback is NULL, the default triple handler is
invoked. The context pointer will be available in the triple
callback function.
Returns YES if the buffer is successfully parsed; otherwise NO is
returned and an error message is logged.
*/
extern BOOL HTRDF_parseBuffer (const char *buffer,
const char *buffer_name,
int buffer_len,
HTTripleCallback_new * new_triple_callback,
void *context);
/*
*/ */
#endif #endif
/* /*
@(#) $Id: HTRDF.html,v 2.2 1999/05/05 18:41:49 frystyk Exp $ @(#) $Id: HTRDF.html,v 2.7 2000/08/30 13:01:57 barstow Exp $
*/ */
 End of changes. 2 change blocks. 
1 lines changed or deleted 44 lines changed or added


 HTResMan.h   HTResMan.h 
skipping to change at line 227 skipping to change at line 227
Original Reponse Header Values Original Reponse Header Values
) )
We store the original headers as they may become useful in many ways We store the original headers as they may become useful in many ways
- for example in lazy parsing. - for example in lazy parsing.
*/ */
HTAssocList * headers; HTAssocList * headers;
/* /*
The reason string furnished by the server, as some servers may send
useful custom information in it
*/
char * reason; /* JK: HTTP reason string */
/*
*/ */
}; /* End of definition of HTResponse */ }; /* End of definition of HTResponse */
/* /*
End of Declaration End of Declaration
*/ */
#endif /* HTRESMAN_H */ #endif /* HTRESMAN_H */
/* /*
@(#) $Id: HTResMan.html,v 2.6 1998/09/01 18:02:19 frystyk Exp $ @(#) $Id: HTResMan.html,v 2.7 2000/10/30 10:04:23 kahan Exp $
*/ */
 End of changes. 2 change blocks. 
1 lines changed or deleted 9 lines changed or added


 HTResponse.h   HTResponse.h 
skipping to change at line 434 skipping to change at line 434
*/ */
extern BOOL HTResponse_addHeader (HTResponse * response, extern BOOL HTResponse_addHeader (HTResponse * response,
char * token, char * value); char * token, char * value);
extern BOOL HTResponse_deleteHeaderAll (HTResponse * response); extern BOOL HTResponse_deleteHeaderAll (HTResponse * response);
extern HTAssocList * HTResponse_header (HTResponse * response); extern HTAssocList * HTResponse_header (HTResponse * response);
extern HTAssocList * HTResponse_handOverHeader (HTResponse * me); extern HTAssocList * HTResponse_handOverHeader (HTResponse * me);
/* /*
(
The HTTP reason string
)
The string returned in the HTTP status line. Some servers send custom
info in this string and applications may want to show it.
*/
extern char * HTResponse_reason (HTResponse * me);
extern BOOL HTResponse_setReason (HTResponse * me, char * reason);
/*
*/ */
#endif /* HTRESPONSE_H */ #endif /* HTRESPONSE_H */
/* /*
@(#) $Id: HTResponse.html,v 2.12 2000/08/04 08:16:00 kahan Exp $ @(#) $Id: HTResponse.html,v 2.14 2000/12/19 11:21:29 kahan Exp $
*/ */
 End of changes. 2 change blocks. 
1 lines changed or deleted 14 lines changed or added


 HTXML.h   HTXML.h 
skipping to change at line 33 skipping to change at line 33
two libraries: libxmltok.a and libxmlparse.a. See two libraries: libxmltok.a and libxmlparse.a. See
the external modules that libwww works with for the external modules that libwww works with for
details. Thanks so much to John Punin for writing this code! details. Thanks so much to John Punin for writing this code!
*/ */
#ifndef HTXML_H #ifndef HTXML_H
#define HTXML_H #define HTXML_H
#include "HTFormat.h" #include "HTFormat.h"
#include "HTStream.h" #include "HTStream.h"
#ifdef HT_STRUCT_XML_STREAM
#include "HTStruct.h" #include "HTStruct.h"
#include "SGML.h" #include "SGML.h"
#endif /* HT_STRUCT_XML_STREAM */
#include <xmlparse.h> #include <xmlparse.h>
/* /*
. .
Libwww Stream Converter Libwww Stream Converter
. .
This stream is a libwww converter which This stream is a libwww converter which
calls and creates a expat stream instance. In order to tell the application calls and creates a expat stream instance. In order to tell the application
skipping to change at line 88 skipping to change at line 90
extern BOOL HTXMLCallback_registerNew (HTXMLCallback_new *, void * context) ; extern BOOL HTXMLCallback_registerNew (HTXMLCallback_new *, void * context) ;
/* /*
. .
XML Expat Stream to Libwww Structured Stream XML Expat Stream to Libwww Structured Stream
. .
This is a stream that converts from the expat stream to a This is a stream that converts from the expat stream to a
libwww structured stream. Again, the application libwww structured stream. Again, the application
can can
*/ #ifdef HT_STRUCT_XML_STREAM
extern BOOL HTXMLStructured_setHandlers( extern BOOL HTXMLStructured_setHandlers(
HTStream * me, HTStream * me,
XML_StartElementHandler start, XML_StartElementHandler start,
XML_EndElementHandler end, XML_EndElementHandler end,
XML_CharacterDataHandler char_data, XML_CharacterDataHandler char_data,
XML_DefaultHandler def_handler); XML_DefaultHandler def_handler);
extern BOOL HTXMLStructured_setUserData (HTStream * me, void * user_data); extern BOOL HTXMLStructured_setUserData (HTStream * me, void * user_data);
extern HTStream * HTXMLStructured_new (const SGML_dtd * dtd, HTStructured * extern HTStream * HTXMLStructured_new (const SGML_dtd * dtd, HTStructured *
starget); starget);
#endif
/* /*
*/ */
#endif #endif
/* /*
@(#) $Id: HTXML.html,v 2.3 1999/04/18 20:23:51 frystyk Exp $ @(#) $Id: HTXML.html,v 2.5 2000/12/19 08:53:43 kahan Exp $
*/ */
 End of changes. 5 change blocks. 
5 lines changed or deleted 7 lines changed or added


 wwwconf.h   wwwconf.h 
skipping to change at line 150 skipping to change at line 150
/* Define if getlogin_r returns an integer */ /* Define if getlogin_r returns an integer */
/* #undef GETLOGIN_R_RETURNS_INT */ /* #undef GETLOGIN_R_RETURNS_INT */
/* Define if getlogin_r returns a pointer */ /* Define if getlogin_r returns a pointer */
/* #undef GETLOGIN_R_RETURNS_POINTER */ /* #undef GETLOGIN_R_RETURNS_POINTER */
/* Define to be the package name. */ /* Define to be the package name. */
#define W3C_PACKAGE "w3c-libwww" #define W3C_PACKAGE "w3c-libwww"
/* Define to be the version. */ /* Define to be the version. */
#define W3C_VERSION "5.3.1" #define W3C_VERSION "5.3.2"
/* Define this to be the prefix for cache files. */ /* Define this to be the prefix for cache files. */
#define CACHE_FILE_PREFIX "/usr/wsrc/" #define CACHE_FILE_PREFIX "/usr/wsrc/"
/* Define to disable Nagle's algorithm */ /* Define to disable Nagle's algorithm */
#define HT_NO_NAGLE 1 #define HT_NO_NAGLE 1
/* Define to disable HTTP/1.1 pipelining */ /* Define to disable HTTP/1.1 pipelining */
/* #undef HT_NO_PIPELINING */ /* #undef HT_NO_PIPELINING */
skipping to change at line 507 skipping to change at line 507
/* Define if you have the nsl library (-lnsl). */ /* Define if you have the nsl library (-lnsl). */
/* #undef HAVE_LIBNSL */ /* #undef HAVE_LIBNSL */
/* Define if you have the socket library (-lsocket). */ /* Define if you have the socket library (-lsocket). */
/* #undef HAVE_LIBSOCKET */ /* #undef HAVE_LIBSOCKET */
/* Name of package */ /* Name of package */
#define PACKAGE "w3c-libwww" #define PACKAGE "w3c-libwww"
/* Version number of package */ /* Version number of package */
#define VERSION "5.3.1" #define VERSION "5.3.2"
/* Define this if you have the external variable 'socket_errno'. */ /* Define this if you have the external variable 'socket_errno'. */
/* #undef HAVE_SOCKET_ERRNO */ /* #undef HAVE_SOCKET_ERRNO */
/* Define this if you have the external variable 'sys_errlist'. */ /* Define this if you have the external variable 'sys_errlist'. */
/* #undef HAVE_SYS_ERRLIST */ /* #undef HAVE_SYS_ERRLIST */
/* Define this if you have the external variable 'sys_nerr'. */ /* Define this if you have the external variable 'sys_nerr'. */
/* #undef HAVE_SYS_NERR */ /* #undef HAVE_SYS_NERR */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 xmlparse.h   xmlparse.h 
skipping to change at line 138 skipping to change at line 138
they will be encoded in UTF-8. Line boundaries are not normalized. they will be encoded in UTF-8. Line boundaries are not normalized.
Note that a byte order mark character is not passed to the default handler. Note that a byte order mark character is not passed to the default handler.
There are no guarantees about how characters are divided between calls There are no guarantees about how characters are divided between calls
to the default handler: for example, a comment might be split between to the default handler: for example, a comment might be split between
multiple calls. */ multiple calls. */
typedef void (*XML_DefaultHandler)(void *userData, typedef void (*XML_DefaultHandler)(void *userData,
const XML_Char *s, const XML_Char *s,
int len); int len);
/* This is called for the start of the DOCTYPE declaration when the
name of the DOCTYPE is encountered. */
typedef void (*XML_StartDoctypeDeclHandler)(void *userData,
const XML_Char *doctypeName);
/* This is called for the start of the DOCTYPE declaration when the
closing > is encountered, but after processing any external subset. */
typedef void (*XML_EndDoctypeDeclHandler)(void *userData);
/* This is called for a declaration of an unparsed (NDATA) /* This is called for a declaration of an unparsed (NDATA)
entity. The base argument is whatever was set by XML_SetBase. entity. The base argument is whatever was set by XML_SetBase.
The entityName, systemId and notationName arguments will never be null. The entityName, systemId and notationName arguments will never be null.
The other arguments may be. */ The other arguments may be. */
typedef void (*XML_UnparsedEntityDeclHandler)(void *userData, typedef void (*XML_UnparsedEntityDeclHandler)(void *userData,
const XML_Char *entityName, const XML_Char *entityName,
const XML_Char *base, const XML_Char *base,
const XML_Char *systemId, const XML_Char *systemId,
const XML_Char *publicId, const XML_Char *publicId,
skipping to change at line 310 skipping to change at line 319
XML_DefaultHandler handler); XML_DefaultHandler handler);
/* This sets the default handler but does not inhibit expansion of internal entities. /* This sets the default handler but does not inhibit expansion of internal entities.
The entity reference will not be passed to the default handler. */ The entity reference will not be passed to the default handler. */
void XMLPARSEAPI void XMLPARSEAPI
XML_SetDefaultHandlerExpand(XML_Parser parser, XML_SetDefaultHandlerExpand(XML_Parser parser,
XML_DefaultHandler handler); XML_DefaultHandler handler);
void XMLPARSEAPI void XMLPARSEAPI
XML_SetDoctypeDeclHandler(XML_Parser parser,
XML_StartDoctypeDeclHandler start,
XML_EndDoctypeDeclHandler end);
void XMLPARSEAPI
XML_SetUnparsedEntityDeclHandler(XML_Parser parser, XML_SetUnparsedEntityDeclHandler(XML_Parser parser,
XML_UnparsedEntityDeclHandler handler); XML_UnparsedEntityDeclHandler handler);
void XMLPARSEAPI void XMLPARSEAPI
XML_SetNotationDeclHandler(XML_Parser parser, XML_SetNotationDeclHandler(XML_Parser parser,
XML_NotationDeclHandler handler); XML_NotationDeclHandler handler);
void XMLPARSEAPI void XMLPARSEAPI
XML_SetNamespaceDeclHandler(XML_Parser parser, XML_SetNamespaceDeclHandler(XML_Parser parser,
XML_StartNamespaceDeclHandler start, XML_StartNamespaceDeclHandler start,
skipping to change at line 354 skipping to change at line 368
void XMLPARSEAPI XML_DefaultCurrent(XML_Parser parser); void XMLPARSEAPI XML_DefaultCurrent(XML_Parser parser);
/* This value is passed as the userData argument to callbacks. */ /* This value is passed as the userData argument to callbacks. */
void XMLPARSEAPI void XMLPARSEAPI
XML_SetUserData(XML_Parser parser, void *userData); XML_SetUserData(XML_Parser parser, void *userData);
/* Returns the last value set by XML_SetUserData or null. */ /* Returns the last value set by XML_SetUserData or null. */
#define XML_GetUserData(parser) (*(void **)(parser)) #define XML_GetUserData(parser) (*(void **)(parser))
/* This is equivalent to supplying an encoding argument /* This is equivalent to supplying an encoding argument
to XML_CreateParser. It must not be called after XML_Parse to XML_ParserCreate. It must not be called after XML_Parse
or XML_ParseBuffer. */ or XML_ParseBuffer. */
int XMLPARSEAPI int XMLPARSEAPI
XML_SetEncoding(XML_Parser parser, const XML_Char *encoding); XML_SetEncoding(XML_Parser parser, const XML_Char *encoding);
/* If this function is called, then the parser will be passed /* If this function is called, then the parser will be passed
as the first argument to callbacks instead of userData. as the first argument to callbacks instead of userData.
The userData will still be accessible using XML_GetUserData. */ The userData will still be accessible using XML_GetUserData. */
void XMLPARSEAPI void XMLPARSEAPI
skipping to change at line 416 skipping to change at line 430
This can be called at any point after the first call to an ExternalEntityRe fHandler This can be called at any point after the first call to an ExternalEntityRe fHandler
so longer as the parser has not yet been freed. so longer as the parser has not yet been freed.
The new parser is completely independent and may safely be used in a separa te thread. The new parser is completely independent and may safely be used in a separa te thread.
The handlers and userData are initialized from the parser argument. The handlers and userData are initialized from the parser argument.
Returns 0 if out of memory. Otherwise returns a new XML_Parser object. */ Returns 0 if out of memory. Otherwise returns a new XML_Parser object. */
XML_Parser XMLPARSEAPI XML_Parser XMLPARSEAPI
XML_ExternalEntityParserCreate(XML_Parser parser, XML_ExternalEntityParserCreate(XML_Parser parser,
const XML_Char *context, const XML_Char *context,
const XML_Char *encoding); const XML_Char *encoding);
enum XML_ParamEntityParsing {
XML_PARAM_ENTITY_PARSING_NEVER,
XML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE,
XML_PARAM_ENTITY_PARSING_ALWAYS
};
/* Controls parsing of parameter entities (including the external DTD
subset). If parsing of parameter entities is enabled, then references
to external parameter entities (including the external DTD subset)
will be passed to the handler set with
XML_SetExternalEntityRefHandler. The context passed will be 0.
Unlike external general entities, external parameter entities can only
be parsed synchronously. If the external parameter entity is to be
parsed, it must be parsed during the call to the external entity ref
handler: the complete sequence of XML_ExternalEntityParserCreate,
XML_Parse/XML_ParseBuffer and XML_ParserFree calls must be made during
this call. After XML_ExternalEntityParserCreate has been called to
create the parser for the external parameter entity (context must be 0
for this call), it is illegal to make any calls on the old parser
until XML_ParserFree has been called on the newly created parser. If
the library has been compiled without support for parameter entity
parsing (ie without XML_DTD being defined), then
XML_SetParamEntityParsing will return 0 if parsing of parameter
entities is requested; otherwise it will return non-zero. */
int XMLPARSEAPI
XML_SetParamEntityParsing(XML_Parser parser,
enum XML_ParamEntityParsing parsing);
enum XML_Error { enum XML_Error {
XML_ERROR_NONE, XML_ERROR_NONE,
XML_ERROR_NO_MEMORY, XML_ERROR_NO_MEMORY,
XML_ERROR_SYNTAX, XML_ERROR_SYNTAX,
XML_ERROR_NO_ELEMENTS, XML_ERROR_NO_ELEMENTS,
XML_ERROR_INVALID_TOKEN, XML_ERROR_INVALID_TOKEN,
XML_ERROR_UNCLOSED_TOKEN, XML_ERROR_UNCLOSED_TOKEN,
XML_ERROR_PARTIAL_CHAR, XML_ERROR_PARTIAL_CHAR,
XML_ERROR_TAG_MISMATCH, XML_ERROR_TAG_MISMATCH,
XML_ERROR_DUPLICATE_ATTRIBUTE, XML_ERROR_DUPLICATE_ATTRIBUTE,
 End of changes. 4 change blocks. 
1 lines changed or deleted 44 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/