raptor.h   raptor.h 
skipping to change at line 44 skipping to change at line 44
/* Required for va_list in raptor_vsnprintf */ /* Required for va_list in raptor_vsnprintf */
#include <stdarg.h> #include <stdarg.h>
/** /**
* RAPTOR_API: * RAPTOR_API:
* *
* Macro for wrapping API function call declarations. * Macro for wrapping API function call declarations.
* *
*/ */
#ifdef WIN32 #ifdef WIN32
# ifdef __GNUC__
# undef _declspec
# define _declspec(x) __declspec(x)
# endif
# ifdef RAPTOR_STATIC # ifdef RAPTOR_STATIC
# define RAPTOR_API # define RAPTOR_API
# else # else
# ifdef RAPTOR_INTERNAL # ifdef RAPTOR_INTERNAL
# define RAPTOR_API _declspec(dllexport) # define RAPTOR_API _declspec(dllexport)
# else # else
# define RAPTOR_API _declspec(dllimport) # define RAPTOR_API _declspec(dllimport)
# endif # endif
# endif # endif
#elif defined(__SYMBIAN32__)
# ifdef RAPTOR_INTERNAL
# define RAPTOR_API __declspec(dllexport)
# else
# define RAPTOR_API __declspec(dllimport)
# endif
#else #else
# define RAPTOR_API # define RAPTOR_API
#endif #endif
/* Use gcc 3.1+ feature to allow marking of deprecated API calls. /* Use gcc 3.1+ feature to allow marking of deprecated API calls.
* This gives a warning during compiling. * This gives a warning during compiling.
*/ */
#if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
#ifdef __APPLE_CC__ #ifdef __APPLE_CC__
/* OSX gcc cpp-precomp is broken */ /* OSX gcc cpp-precomp is broken */
#define RAPTOR_DEPRECATED #define RAPTOR_DEPRECATED
#else #else
#define RAPTOR_DEPRECATED __attribute__((deprecated)) #define RAPTOR_DEPRECATED __attribute__((deprecated))
#endif #endif
#else #else
#define RAPTOR_DEPRECATED #define RAPTOR_DEPRECATED
#endif #endif
/**
* RAPTOR_PRINTF_FORMAT:
* @string_index: ignore me
* @first_to_check_index: ignore me
*
* Internal macro
*/
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
#define RAPTOR_PRINTF_FORMAT(string_index, first_to_check_index) \ #define RAPTOR_PRINTF_FORMAT(string_index, first_to_check_index) \
__attribute__((__format__(__printf__, string_index, first_to_check_index) )) __attribute__((__format__(__printf__, string_index, first_to_check_index) ))
#else #else
#define RAPTOR_PRINTF_FORMAT(string_index, first_to_check_index) #define RAPTOR_PRINTF_FORMAT(string_index, first_to_check_index)
#endif #endif
/** /**
* raptor_uri: * raptor_uri:
* *
skipping to change at line 323 skipping to change at line 340
* relative URIs will be used wherever possible when serializing. * relative URIs will be used wherever possible when serializing.
* @RAPTOR_FEATURE_START_URI: Set the start URI for serlalizing to use. * @RAPTOR_FEATURE_START_URI: Set the start URI for serlalizing to use.
* @RAPTOR_FEATURE_WRITER_AUTO_INDENT: Automatically indent elements when * @RAPTOR_FEATURE_WRITER_AUTO_INDENT: Automatically indent elements when
* seriailizing. * seriailizing.
* @RAPTOR_FEATURE_WRITER_AUTO_EMPTY: Automatically detect and * @RAPTOR_FEATURE_WRITER_AUTO_EMPTY: Automatically detect and
* abbreviate empty elements when serializing. * abbreviate empty elements when serializing.
* @RAPTOR_FEATURE_WRITER_INDENT_WIDTH: Integer number of spaces to use * @RAPTOR_FEATURE_WRITER_INDENT_WIDTH: Integer number of spaces to use
* for each indent level when serializing with auto indent. * for each indent level when serializing with auto indent.
* @RAPTOR_FEATURE_WRITER_XML_VERSION: Integer XML version XML 1.0 (10) or XML 1.1 (11) * @RAPTOR_FEATURE_WRITER_XML_VERSION: Integer XML version XML 1.0 (10) or XML 1.1 (11)
* @RAPTOR_FEATURE_WRITER_XML_DECLARATION: Write XML 1.0 or 1.1 declaration . * @RAPTOR_FEATURE_WRITER_XML_DECLARATION: Write XML 1.0 or 1.1 declaration .
* @RAPTOR_FEATURE_NO_NET: Deny network requests * @RAPTOR_FEATURE_NO_NET: Deny network requests.
* @RAPTOR_FEATURE_RESOURCE_BORDER: Border color of resource * @RAPTOR_FEATURE_RESOURCE_BORDER: Border color of resource
* nodes for GraphViz DOT serializer. * nodes for GraphViz DOT serializer.
* @RAPTOR_FEATURE_LITERAL_BORDER: Border color of literal nodes * @RAPTOR_FEATURE_LITERAL_BORDER: Border color of literal nodes
* for GraphViz DOT serializer. * for GraphViz DOT serializer.
* @RAPTOR_FEATURE_BNODE_BORDER: Border color of blank nodes for * @RAPTOR_FEATURE_BNODE_BORDER: Border color of blank nodes for
* GraphViz DOT serializer. * GraphViz DOT serializer.
* @RAPTOR_FEATURE_RESOURCE_FILL: Fill color of resource nodes * @RAPTOR_FEATURE_RESOURCE_FILL: Fill color of resource nodes
* for GraphViz DOT serializer. * for GraphViz DOT serializer.
* @RAPTOR_FEATURE_LITERAL_FILL: Fill color of literal nodes for * @RAPTOR_FEATURE_LITERAL_FILL: Fill color of literal nodes for
* GraphViz DOT serializer. * GraphViz DOT serializer.
* @RAPTOR_FEATURE_BNODE_FILL: Fill color of blank nodes for * @RAPTOR_FEATURE_BNODE_FILL: Fill color of blank nodes for
* GraphViz DOT serializer. * GraphViz DOT serializer.
* @RAPTOR_FEATURE_HTML_TAG_SOUP: Use a lax HTML parser if an XML parser
* fails when read HTML for GRDDL parser.
* @RAPTOR_FEATURE_MICROFORMATS: Look for microformats for GRDDL parser.
* @RAPTOR_FEATURE_HTML_LINK: Look for head &lt;link&gt; to type rdf/xml
* for GRDDL parser.
* @RAPTOR_FEATURE_WWW_TIMEOUT: Set timeout for internal WWW URI requests
* for GRDDL parser.
* @RAPTOR_FEATURE_LAST: Internal * @RAPTOR_FEATURE_LAST: Internal
* *
* Raptor parser, serializer or XML writer features. * Raptor parser, serializer or XML writer features.
*/ */
typedef enum { typedef enum {
RAPTOR_FEATURE_SCANNING, RAPTOR_FEATURE_SCANNING,
RAPTOR_FEATURE_ASSUME_IS_RDF, RAPTOR_FEATURE_ASSUME_IS_RDF,
RAPTOR_FEATURE_ALLOW_NON_NS_ATTRIBUTES, RAPTOR_FEATURE_ALLOW_NON_NS_ATTRIBUTES,
RAPTOR_FEATURE_ALLOW_OTHER_PARSETYPES, RAPTOR_FEATURE_ALLOW_OTHER_PARSETYPES,
RAPTOR_FEATURE_ALLOW_BAGID, RAPTOR_FEATURE_ALLOW_BAGID,
skipping to change at line 365 skipping to change at line 389
RAPTOR_FEATURE_WRITER_INDENT_WIDTH, RAPTOR_FEATURE_WRITER_INDENT_WIDTH,
RAPTOR_FEATURE_WRITER_XML_VERSION, RAPTOR_FEATURE_WRITER_XML_VERSION,
RAPTOR_FEATURE_WRITER_XML_DECLARATION, RAPTOR_FEATURE_WRITER_XML_DECLARATION,
RAPTOR_FEATURE_NO_NET, RAPTOR_FEATURE_NO_NET,
RAPTOR_FEATURE_RESOURCE_BORDER, RAPTOR_FEATURE_RESOURCE_BORDER,
RAPTOR_FEATURE_LITERAL_BORDER, RAPTOR_FEATURE_LITERAL_BORDER,
RAPTOR_FEATURE_BNODE_BORDER, RAPTOR_FEATURE_BNODE_BORDER,
RAPTOR_FEATURE_RESOURCE_FILL, RAPTOR_FEATURE_RESOURCE_FILL,
RAPTOR_FEATURE_LITERAL_FILL, RAPTOR_FEATURE_LITERAL_FILL,
RAPTOR_FEATURE_BNODE_FILL, RAPTOR_FEATURE_BNODE_FILL,
RAPTOR_FEATURE_LAST=RAPTOR_FEATURE_BNODE_FILL RAPTOR_FEATURE_HTML_TAG_SOUP,
RAPTOR_FEATURE_MICROFORMATS,
RAPTOR_FEATURE_HTML_LINK,
RAPTOR_FEATURE_WWW_TIMEOUT,
RAPTOR_FEATURE_LAST=RAPTOR_FEATURE_WWW_TIMEOUT
} raptor_feature; } raptor_feature;
/** /**
* raptor_genid_type: * raptor_genid_type:
* @RAPTOR_GENID_TYPE_BNODEID: Generated ID is for a blank node * @RAPTOR_GENID_TYPE_BNODEID: Generated ID is for a blank node
* @RAPTOR_GENID_TYPE_BAGID: Generated ID is for rdf:bagID * @RAPTOR_GENID_TYPE_BAGID: Generated ID is for rdf:bagID
* *
* Intended type for a generated identifier asked for by the handler * Intended type for a generated identifier asked for by the handler
* registered with raptor_set_generate_id_handler(). * registered with raptor_set_generate_id_handler().
*/ */
skipping to change at line 506 skipping to change at line 534
* @uri1: URI object 1 * @uri1: URI object 1
* @uri2: URI object 2 * @uri2: URI object 2
* *
* Handler function for implementing raptor_uri_equals(). * Handler function for implementing raptor_uri_equals().
* *
* Return value: non-0 if the URIs are equal * Return value: non-0 if the URIs are equal
*/ */
typedef int (*raptor_uri_equals_func) (void *context, raptor_uri* uri1, rap tor_uri* uri2); typedef int (*raptor_uri_equals_func) (void *context, raptor_uri* uri1, rap tor_uri* uri2);
/** /**
* raptor_uri_compare_func:
* @context: URI context data
* @uri1: URI object 1
* @uri2: URI object 2
*
* Handler function for implementing raptor_uri_equals().
*
* Return value: -1 if uri1 < uri2, 0 if equal, 1 if uri1 > uri2
*/
typedef int (*raptor_uri_compare_func) (void *context, raptor_uri* uri1, ra
ptor_uri* uri2);
/**
* raptor_uri_copy_func: * raptor_uri_copy_func:
* @context: URI context data * @context: URI context data
* @uri: URI object * @uri: URI object
* *
* Handler function for implementing raptor_uri_copy(). * Handler function for implementing raptor_uri_copy().
* *
* Return value: new URI object or NULL on failure * Return value: new URI object or NULL on failure
*/ */
typedef raptor_uri* (*raptor_uri_copy_func) (void *context, raptor_uri *uri ); typedef raptor_uri* (*raptor_uri_copy_func) (void *context, raptor_uri *uri );
skipping to change at line 547 skipping to change at line 587
typedef unsigned char* (*raptor_uri_as_counted_string_func)(void *context, raptor_uri *uri, size_t* len_p); typedef unsigned char* (*raptor_uri_as_counted_string_func)(void *context, raptor_uri *uri, size_t* len_p);
/** /**
* raptor_uri_handler: * raptor_uri_handler:
* @new_uri: function for raptor_new_uri() * @new_uri: function for raptor_new_uri()
* @new_uri_from_uri_local_name: function for raptor_new_uri_from_uri_local _name() * @new_uri_from_uri_local_name: function for raptor_new_uri_from_uri_local _name()
* @new_uri_relative_to_base: function for raptor_new_uri_relative_to_base( ) * @new_uri_relative_to_base: function for raptor_new_uri_relative_to_base( )
* @new_uri_for_rdf_concept: function for raptor_new_uri_for_rdf_concept() * @new_uri_for_rdf_concept: function for raptor_new_uri_for_rdf_concept()
* @free_uri: function for raptor_free_uri() * @free_uri: function for raptor_free_uri()
* @uri_equals: function for raptor_uri_equals() * @uri_equals: function for raptor_uri_equals()
* @uri_compare: function for raptor_uri_compare()
* @uri_copy: function for raptor_uri_copy() * @uri_copy: function for raptor_uri_copy()
* @uri_as_string: function for raptor_uri_as_string() * @uri_as_string: function for raptor_uri_as_string()
* @uri_as_counted_string: function for raptor_uri_as_counted_string() * @uri_as_counted_string: function for raptor_uri_as_counted_string()
* @initialised: Internal * @initialised: API version - set to API version implemented: 1..2
* *
* URI implementation handler structure. * URI implementation handler structure.
*/ */
typedef struct { typedef struct {
/* constructors */ /* constructors - URI Interface V1 */
raptor_new_uri_func new_uri; raptor_new_uri_func new_uri;
raptor_new_uri_from_uri_local_name_func new_uri_from_uri_local_name; raptor_new_uri_from_uri_local_name_func new_uri_from_uri_local_name;
raptor_new_uri_relative_to_base_func new_uri_relative_to_base; raptor_new_uri_relative_to_base_func new_uri_relative_to_base;
raptor_new_uri_for_rdf_concept_func new_uri_for_rdf_concept; raptor_new_uri_for_rdf_concept_func new_uri_for_rdf_concept;
/* destructor */ /* destructor - URI Interface V1 */
raptor_free_uri_func free_uri; raptor_free_uri_func free_uri;
/* methods */ /* methods - URI Interface V1 */
raptor_uri_equals_func uri_equals; raptor_uri_equals_func uri_equals;
raptor_uri_copy_func uri_copy; /* well, copy construct or */ raptor_uri_copy_func uri_copy; /* well, copy construct or */
raptor_uri_as_string_func uri_as_string; raptor_uri_as_string_func uri_as_string;
raptor_uri_as_counted_string_func uri_as_counted_string; raptor_uri_as_counted_string_func uri_as_counted_string;
int initialised; int initialised;
/* methods - URI Interface V2 */
raptor_uri_compare_func uri_compare;
} raptor_uri_handler; } raptor_uri_handler;
/** /**
* raptor_simple_message_handler: * raptor_simple_message_handler:
* @user_data: user data * @user_data: user data
* @message: message to report * @message: message to report
* @...: arguments for message * @...: arguments for message
* *
* Simple message handler function. * Simple message handler function.
* *
skipping to change at line 616 skipping to change at line 659
/** /**
* raptor_statement_handler: * raptor_statement_handler:
* @user_data: user data * @user_data: user data
* @statement: statement to report * @statement: statement to report
* *
* Statement (triple) reporting handler function. * Statement (triple) reporting handler function.
*/ */
typedef void (*raptor_statement_handler)(void *user_data, const raptor_stat ement *statement); typedef void (*raptor_statement_handler)(void *user_data, const raptor_stat ement *statement);
/** /**
* raptor_graph_handler:
* @user_data: user data
* @graph: graph to report, 0 for the default graph
*
* Named graph reporting handler function. Due to historic reasons the name
d graph
* API is separated from the statement handler. A graph is reported after a
ll its
* statements.
*/
typedef void (*raptor_graph_handler)(void *user_data, raptor_uri *graph);
/**
* raptor_generate_id_handler: * raptor_generate_id_handler:
* @user_data: user data * @user_data: user data
* @type: type of ID to create * @type: type of ID to create
* @user_bnodeid: a user-specified ID or NULL if none available. * @user_bnodeid: a user-specified ID or NULL if none available.
* *
* Generate an identifier handler function. * Generate an identifier handler function.
* *
* Return value: new ID to use * Return value: new ID to use
*/ */
typedef unsigned char* (*raptor_generate_id_handler)(void *user_data, rapto r_genid_type type, unsigned char* user_bnodeid); typedef unsigned char* (*raptor_generate_id_handler)(void *user_data, rapto r_genid_type type, unsigned char* user_bnodeid);
skipping to change at line 664 skipping to change at line 718
* @userdata: user data * @userdata: user data
* @content_type: content type seen * @content_type: content type seen
* *
* Receiving Content-Type: header from WWW retrieval handler. * Receiving Content-Type: header from WWW retrieval handler.
* *
* Set by raptor_www_set_content_type_handler(). * Set by raptor_www_set_content_type_handler().
*/ */
typedef void (*raptor_www_content_type_handler)(raptor_www* www, void *user data, const char *content_type); typedef void (*raptor_www_content_type_handler)(raptor_www* www, void *user data, const char *content_type);
/** /**
* raptor_www_final_uri_handler:
* @www: WWW object
* @userdata: user data
* @final_uri: final URI seen
*
* Receiving the final resolved URI from a WWW retrieval
*
* Set by raptor_www_set_final_uri_handler().
*/
typedef void (*raptor_www_final_uri_handler)(raptor_www* www, void *userdat
a, raptor_uri *final_uri);
/**
* raptor_uri_filter_func: * raptor_uri_filter_func:
* @user_data: user data * @user_data: user data
* @uri: #raptor_uri URI to check * @uri: #raptor_uri URI to check
* *
* Callback function for #raptor_www_set_uri_filter * Callback function for #raptor_www_set_uri_filter
* *
* Return value: non-0 to filter the URI * Return value: non-0 to filter the URI
*/ */
typedef int (*raptor_uri_filter_func)(void *user_data, raptor_uri* uri); typedef int (*raptor_uri_filter_func)(void *user_data, raptor_uri* uri);
skipping to change at line 714 skipping to change at line 780
/* Handlers */ /* Handlers */
RAPTOR_API RAPTOR_API
void raptor_set_fatal_error_handler(raptor_parser* parser, void *user_data, raptor_message_handler handler); void raptor_set_fatal_error_handler(raptor_parser* parser, void *user_data, raptor_message_handler handler);
RAPTOR_API RAPTOR_API
void raptor_set_error_handler(raptor_parser* parser, void *user_data, rapto r_message_handler handler); void raptor_set_error_handler(raptor_parser* parser, void *user_data, rapto r_message_handler handler);
RAPTOR_API RAPTOR_API
void raptor_set_warning_handler(raptor_parser* parser, void *user_data, rap tor_message_handler handler); void raptor_set_warning_handler(raptor_parser* parser, void *user_data, rap tor_message_handler handler);
RAPTOR_API RAPTOR_API
void raptor_set_statement_handler(raptor_parser* parser, void *user_data, r aptor_statement_handler handler); void raptor_set_statement_handler(raptor_parser* parser, void *user_data, r aptor_statement_handler handler);
RAPTOR_API RAPTOR_API
void raptor_set_graph_handler(raptor_parser* parser, void *user_data, rapto
r_graph_handler handler);
RAPTOR_API
void raptor_set_generate_id_handler(raptor_parser* parser, void *user_data, raptor_generate_id_handler handler); void raptor_set_generate_id_handler(raptor_parser* parser, void *user_data, raptor_generate_id_handler handler);
RAPTOR_API RAPTOR_API
void raptor_set_namespace_handler(raptor_parser* parser, void *user_data, r aptor_namespace_handler handler); void raptor_set_namespace_handler(raptor_parser* parser, void *user_data, r aptor_namespace_handler handler);
RAPTOR_API RAPTOR_API
void raptor_parser_set_uri_filter(raptor_parser* parser, raptor_uri_filter_ func filter, void* user_data); void raptor_parser_set_uri_filter(raptor_parser* parser, raptor_uri_filter_ func filter, void* user_data);
RAPTOR_API RAPTOR_API
void raptor_print_statement(const raptor_statement * statement, FILE *strea m); void raptor_print_statement(const raptor_statement * statement, FILE *strea m);
RAPTOR_API RAPTOR_API
void raptor_print_statement_as_ntriples(const raptor_statement * statement, FILE *stream); void raptor_print_statement_as_ntriples(const raptor_statement * statement, FILE *stream);
skipping to change at line 866 skipping to change at line 934
raptor_uri* raptor_new_uri_relative_to_base(raptor_uri *base_uri, const uns igned char *uri_string); raptor_uri* raptor_new_uri_relative_to_base(raptor_uri *base_uri, const uns igned char *uri_string);
RAPTOR_API RAPTOR_API
raptor_uri* raptor_new_uri_from_id(raptor_uri *base_uri, const unsigned cha r *id); raptor_uri* raptor_new_uri_from_id(raptor_uri *base_uri, const unsigned cha r *id);
RAPTOR_API RAPTOR_API
raptor_uri* raptor_new_uri_for_rdf_concept(const char *name); raptor_uri* raptor_new_uri_for_rdf_concept(const char *name);
RAPTOR_API RAPTOR_API
void raptor_free_uri(raptor_uri *uri); void raptor_free_uri(raptor_uri *uri);
RAPTOR_API RAPTOR_API
int raptor_uri_equals(raptor_uri* uri1, raptor_uri* uri2); int raptor_uri_equals(raptor_uri* uri1, raptor_uri* uri2);
RAPTOR_API RAPTOR_API
int raptor_uri_compare(raptor_uri* uri1, raptor_uri* uri2);
RAPTOR_API
raptor_uri* raptor_uri_copy(raptor_uri *uri); raptor_uri* raptor_uri_copy(raptor_uri *uri);
RAPTOR_API RAPTOR_API
unsigned char* raptor_uri_as_string(raptor_uri *uri); unsigned char* raptor_uri_as_string(raptor_uri *uri);
RAPTOR_API RAPTOR_API
unsigned char* raptor_uri_as_counted_string(raptor_uri *uri, size_t* len_p) ; unsigned char* raptor_uri_as_counted_string(raptor_uri *uri, size_t* len_p) ;
/* Make an xml:base-compatible URI from an existing one */ /* Make an xml:base-compatible URI from an existing one */
RAPTOR_API RAPTOR_API
raptor_uri* raptor_new_uri_for_xmlbase(raptor_uri* old_uri); raptor_uri* raptor_new_uri_for_xmlbase(raptor_uri* old_uri);
/* Make a URI suitable for retrieval (no fragment, has path) from an existi ng one */ /* Make a URI suitable for retrieval (no fragment, has path) from an existi ng one */
skipping to change at line 942 skipping to change at line 1012
RAPTOR_API RAPTOR_API
unsigned char* raptor_uri_to_relative_uri_string(raptor_uri *base_uri, rap tor_uri *reference_uri); unsigned char* raptor_uri_to_relative_uri_string(raptor_uri *base_uri, rap tor_uri *reference_uri);
RAPTOR_API RAPTOR_API
void raptor_uri_print(const raptor_uri* uri, FILE *stream); void raptor_uri_print(const raptor_uri* uri, FILE *stream);
RAPTOR_API RAPTOR_API
unsigned char* raptor_uri_to_counted_string(raptor_uri *uri, size_t *len_p) ; unsigned char* raptor_uri_to_counted_string(raptor_uri *uri, size_t *len_p) ;
RAPTOR_API RAPTOR_API
unsigned char* raptor_uri_to_string(raptor_uri *uri); unsigned char* raptor_uri_to_string(raptor_uri *uri);
RAPTOR_API RAPTOR_API
void raptor_uri_set_handler(const raptor_uri_handler *handler, void *contex t); void raptor_uri_set_handler(raptor_uri_handler *handler, void *context);
RAPTOR_API RAPTOR_API
void raptor_uri_get_handler(raptor_uri_handler **handler, void **context); void raptor_uri_get_handler(raptor_uri_handler **handler, void **context);
/** /**
* RAPTOR_RDF_MS_URI: * RAPTOR_RDF_MS_URI:
* *
* RDF Namespace URI (rdf:). * RDF Namespace URI (rdf:).
* *
* Copy with raptor_uri_copy() to use. * Copy with raptor_uri_copy() to use.
*/ */
skipping to change at line 1008 skipping to change at line 1078
void raptor_www_set_user_agent(raptor_www *www, const char *user_agent); void raptor_www_set_user_agent(raptor_www *www, const char *user_agent);
RAPTOR_API RAPTOR_API
void raptor_www_set_proxy(raptor_www *www, const char *proxy); void raptor_www_set_proxy(raptor_www *www, const char *proxy);
RAPTOR_API RAPTOR_API
void raptor_www_set_http_accept(raptor_www *www, const char *value); void raptor_www_set_http_accept(raptor_www *www, const char *value);
RAPTOR_API RAPTOR_API
void raptor_www_set_write_bytes_handler(raptor_www *www, raptor_www_write_b ytes_handler handler, void *user_data); void raptor_www_set_write_bytes_handler(raptor_www *www, raptor_www_write_b ytes_handler handler, void *user_data);
RAPTOR_API RAPTOR_API
void raptor_www_set_content_type_handler(raptor_www *www, raptor_www_conten t_type_handler handler, void *user_data); void raptor_www_set_content_type_handler(raptor_www *www, raptor_www_conten t_type_handler handler, void *user_data);
RAPTOR_API RAPTOR_API
void raptor_www_set_final_uri_handler(raptor_www* www, raptor_www_final_uri
_handler handler, void *user_data);
RAPTOR_API
void raptor_www_set_error_handler(raptor_www *www, raptor_message_handler e rror_handler, void *error_data); void raptor_www_set_error_handler(raptor_www *www, raptor_message_handler e rror_handler, void *error_data);
RAPTOR_API RAPTOR_API
void raptor_www_set_uri_filter(raptor_www* www, raptor_uri_filter_func filt er, void* user_data); void raptor_www_set_uri_filter(raptor_www* www, raptor_uri_filter_func filt er, void* user_data);
RAPTOR_API RAPTOR_API
void raptor_www_set_connection_timeout(raptor_www* www, int timeout);
RAPTOR_API
int raptor_www_fetch(raptor_www *www, raptor_uri *uri); int raptor_www_fetch(raptor_www *www, raptor_uri *uri);
RAPTOR_API RAPTOR_API
int raptor_www_fetch_to_string(raptor_www *www, raptor_uri *uri, void **str ing_p, size_t *length_p, void *(*malloc_handler)(size_t size)); int raptor_www_fetch_to_string(raptor_www *www, raptor_uri *uri, void **str ing_p, size_t *length_p, void *(*malloc_handler)(size_t size));
RAPTOR_API RAPTOR_API
void* raptor_www_get_connection(raptor_www *www); void* raptor_www_get_connection(raptor_www *www);
RAPTOR_API RAPTOR_API
void raptor_www_abort(raptor_www *www, const char *reason); void raptor_www_abort(raptor_www *www, const char *reason);
RAPTOR_API
raptor_uri* raptor_www_get_final_uri(raptor_www* www);
/* raptor_qname - XML qnames */ /* raptor_qname - XML qnames */
RAPTOR_API RAPTOR_API
raptor_qname* raptor_new_qname(raptor_namespace_stack *nstack, const unsign ed char *name, const unsigned char *value, raptor_simple_message_handler er ror_handler, void *error_data); raptor_qname* raptor_new_qname(raptor_namespace_stack *nstack, const unsign ed char *name, const unsigned char *value, raptor_simple_message_handler er ror_handler, void *error_data);
RAPTOR_API RAPTOR_API
raptor_qname* raptor_new_qname_from_namespace_local_name(raptor_namespace * ns, const unsigned char *local_name, const unsigned char *value); raptor_qname* raptor_new_qname_from_namespace_local_name(raptor_namespace * ns, const unsigned char *local_name, const unsigned char *value);
RAPTOR_API RAPTOR_API
raptor_qname* raptor_qname_copy(raptor_qname *qname); raptor_qname* raptor_qname_copy(raptor_qname *qname);
RAPTOR_API RAPTOR_API
void raptor_free_qname(raptor_qname* name); void raptor_free_qname(raptor_qname* name);
skipping to change at line 1046 skipping to change at line 1122
RAPTOR_API RAPTOR_API
const raptor_namespace* raptor_qname_get_namespace(raptor_qname* name); const raptor_namespace* raptor_qname_get_namespace(raptor_qname* name);
/* raptor_namespace_stack - stack of XML namespaces */ /* raptor_namespace_stack - stack of XML namespaces */
RAPTOR_API RAPTOR_API
raptor_namespace* raptor_new_namespace_from_uri(raptor_namespace_stack *nst ack, const unsigned char *prefix, raptor_uri* ns_uri, int depth); raptor_namespace* raptor_new_namespace_from_uri(raptor_namespace_stack *nst ack, const unsigned char *prefix, raptor_uri* ns_uri, int depth);
RAPTOR_API RAPTOR_API
raptor_namespace_stack* raptor_new_namespaces(raptor_uri_handler *uri_handl er, void *uri_context, raptor_simple_message_handler error_handler, void *e rror_data, int defaults); raptor_namespace_stack* raptor_new_namespaces(raptor_uri_handler *uri_handl er, void *uri_context, raptor_simple_message_handler error_handler, void *e rror_data, int defaults);
RAPTOR_API RAPTOR_API
void raptor_namespaces_init(raptor_namespace_stack *nstack, raptor_uri_hand ler *uri_handler, void *uri_context, raptor_simple_message_handler error_ha ndler, void *error_data, int defaults); int raptor_namespaces_init(raptor_namespace_stack *nstack, raptor_uri_handl er *uri_handler, void *uri_context, raptor_simple_message_handler error_han dler, void *error_data, int defaults);
RAPTOR_API RAPTOR_API
void raptor_namespaces_clear(raptor_namespace_stack *nstack); void raptor_namespaces_clear(raptor_namespace_stack *nstack);
RAPTOR_API RAPTOR_API
void raptor_free_namespaces(raptor_namespace_stack *nstack); void raptor_free_namespaces(raptor_namespace_stack *nstack);
RAPTOR_API RAPTOR_API
void raptor_namespaces_start_namespace(raptor_namespace_stack *nstack, rapt or_namespace *nspace); void raptor_namespaces_start_namespace(raptor_namespace_stack *nstack, rapt or_namespace *nspace);
RAPTOR_API RAPTOR_API
int raptor_namespaces_start_namespace_full(raptor_namespace_stack *nstack, const unsigned char *prefix, const unsigned char *ns_uri_string, int depth) ; int raptor_namespaces_start_namespace_full(raptor_namespace_stack *nstack, const unsigned char *prefix, const unsigned char *ns_uri_string, int depth) ;
RAPTOR_API RAPTOR_API
void raptor_namespaces_end_for_depth(raptor_namespace_stack *nstack, int de pth); void raptor_namespaces_end_for_depth(raptor_namespace_stack *nstack, int de pth);
skipping to change at line 1164 skipping to change at line 1240
RAPTOR_API RAPTOR_API
void raptor_sequence_print_uri(char *data, FILE *fh); void raptor_sequence_print_uri(char *data, FILE *fh);
RAPTOR_API RAPTOR_API
void raptor_sequence_set_print_handler(raptor_sequence *seq, raptor_sequenc e_print_handler *print_handler); void raptor_sequence_set_print_handler(raptor_sequence *seq, raptor_sequenc e_print_handler *print_handler);
RAPTOR_API RAPTOR_API
void raptor_sequence_print(raptor_sequence* seq, FILE* fh); void raptor_sequence_print(raptor_sequence* seq, FILE* fh);
RAPTOR_API RAPTOR_API
int raptor_sequence_join(raptor_sequence* dest, raptor_sequence *src); int raptor_sequence_join(raptor_sequence* dest, raptor_sequence *src);
/* Unicode and UTF8 */ /* Unicode and UTF8 */
/**
* raptor_unichar:
*
* raptor Unicode codepoint
*/
typedef unsigned long raptor_unichar;
RAPTOR_API RAPTOR_API
int raptor_unicode_char_to_utf8(unsigned long c, unsigned char *output); int raptor_unicode_char_to_utf8(raptor_unichar c, unsigned char *output);
RAPTOR_API RAPTOR_API
int raptor_utf8_to_unicode_char(unsigned long *output, const unsigned char *input, int length); int raptor_utf8_to_unicode_char(raptor_unichar *output, const unsigned char *input, int length);
RAPTOR_API RAPTOR_API
int raptor_unicode_is_xml11_namestartchar(long c); int raptor_unicode_is_xml11_namestartchar(raptor_unichar c);
RAPTOR_API RAPTOR_API
int raptor_unicode_is_xml10_namestartchar(long c); int raptor_unicode_is_xml10_namestartchar(raptor_unichar c);
RAPTOR_API RAPTOR_API
int raptor_unicode_is_xml11_namechar(long c); int raptor_unicode_is_xml11_namechar(raptor_unichar c);
RAPTOR_API RAPTOR_API
int raptor_unicode_is_xml10_namechar(long c); int raptor_unicode_is_xml10_namechar(raptor_unichar c);
RAPTOR_API RAPTOR_API
int raptor_utf8_check(const unsigned char *string, size_t length); int raptor_utf8_check(const unsigned char *string, size_t length);
/* raptor_stringbuffer */ /* raptor_stringbuffer */
RAPTOR_API RAPTOR_API
raptor_stringbuffer* raptor_new_stringbuffer(void); raptor_stringbuffer* raptor_new_stringbuffer(void);
RAPTOR_API RAPTOR_API
void raptor_free_stringbuffer(raptor_stringbuffer *stringbuffer); void raptor_free_stringbuffer(raptor_stringbuffer *stringbuffer);
RAPTOR_API RAPTOR_API
int raptor_stringbuffer_append_counted_string(raptor_stringbuffer* stringbu ffer, const unsigned char *string, size_t length, int do_copy); int raptor_stringbuffer_append_counted_string(raptor_stringbuffer* stringbu ffer, const unsigned char *string, size_t length, int do_copy);
skipping to change at line 1317 skipping to change at line 1400
/* Parser and Serializer features */ /* Parser and Serializer features */
RAPTOR_API RAPTOR_API
raptor_feature raptor_feature_from_uri(raptor_uri *uri); raptor_feature raptor_feature_from_uri(raptor_uri *uri);
RAPTOR_API RAPTOR_API
int raptor_feature_value_type(const raptor_feature feature); int raptor_feature_value_type(const raptor_feature feature);
/* SAX2 element Class (raptor_xml_element) */ /* SAX2 element Class (raptor_xml_element) */
RAPTOR_API RAPTOR_API
raptor_xml_element* raptor_new_xml_element(raptor_qname* name, const unsign ed char* xml_language, raptor_uri* xml_base); raptor_xml_element* raptor_new_xml_element(raptor_qname* name, const unsign ed char* xml_language, raptor_uri* xml_base);
RAPTOR_API RAPTOR_API
raptor_xml_element* raptor_new_xml_element_from_namespace_local_name(raptor
_namespace *ns, const unsigned char *name, const unsigned char *xml_languag
e, raptor_uri *xml_base);
RAPTOR_API
void raptor_free_xml_element(raptor_xml_element *element); void raptor_free_xml_element(raptor_xml_element *element);
RAPTOR_API RAPTOR_API
raptor_qname* raptor_xml_element_get_name(raptor_xml_element *xml_element); raptor_qname* raptor_xml_element_get_name(raptor_xml_element *xml_element);
RAPTOR_API RAPTOR_API
void raptor_xml_element_set_attributes(raptor_xml_element* xml_element, rap tor_qname **attributes, int count); void raptor_xml_element_set_attributes(raptor_xml_element* xml_element, rap tor_qname **attributes, int count);
RAPTOR_API RAPTOR_API
raptor_qname** raptor_xml_element_get_attributes(raptor_xml_element* xml_el ement); raptor_qname** raptor_xml_element_get_attributes(raptor_xml_element* xml_el ement);
RAPTOR_API RAPTOR_API
int raptor_xml_element_get_attributes_count(raptor_xml_element* xml_element ); int raptor_xml_element_get_attributes_count(raptor_xml_element* xml_element );
RAPTOR_API RAPTOR_API
 End of changes. 30 change blocks. 
14 lines changed or deleted 107 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/