raptor2.h   raptor2.h 
skipping to change at line 51 skipping to change at line 51
*/ */
#define RAPTOR_V2_AVAILABLE 1 #define RAPTOR_V2_AVAILABLE 1
/** /**
* RAPTOR_VERSION: * RAPTOR_VERSION:
* *
* Raptor library version number * Raptor library version number
* *
* Format: major * 10000 + minor * 100 + release * Format: major * 10000 + minor * 100 + release
*/ */
#define RAPTOR_VERSION 20006 #define RAPTOR_VERSION 20007
/** /**
* RAPTOR_VERSION_STRING: * RAPTOR_VERSION_STRING:
* *
* Raptor library version string * Raptor library version string
*/ */
#define RAPTOR_VERSION_STRING "2.0.6" #define RAPTOR_VERSION_STRING "2.0.7"
/** /**
* RAPTOR_VERSION_MAJOR: * RAPTOR_VERSION_MAJOR:
* *
* Raptor library major version * Raptor library major version
*/ */
#define RAPTOR_VERSION_MAJOR 2 #define RAPTOR_VERSION_MAJOR 2
/** /**
* RAPTOR_VERSION_MINOR: * RAPTOR_VERSION_MINOR:
* *
* Raptor library minor version * Raptor library minor version
*/ */
#define RAPTOR_VERSION_MINOR 0 #define RAPTOR_VERSION_MINOR 0
/** /**
* RAPTOR_VERSION_RELEASE: * RAPTOR_VERSION_RELEASE:
* *
* Raptor library release * Raptor library release
*/ */
#define RAPTOR_VERSION_RELEASE 6 #define RAPTOR_VERSION_RELEASE 7
/** /**
* RAPTOR_API: * RAPTOR_API:
* *
* Macro for wrapping API function call declarations. * Macro for wrapping API function call declarations.
* *
*/ */
#ifndef RAPTOR_API #ifndef RAPTOR_API
# ifdef WIN32 # ifdef WIN32
# ifdef __GNUC__ # ifdef __GNUC__
skipping to change at line 483 skipping to change at line 483
* @RAPTOR_OPTION_RELATIVE_URIS: If true (default true) then * @RAPTOR_OPTION_RELATIVE_URIS: If true (default true) then
* relative URIs will be used wherever possible when serializing. * relative URIs will be used wherever possible when serializing.
* @RAPTOR_OPTION_WRITER_AUTO_INDENT: Automatically indent elements when * @RAPTOR_OPTION_WRITER_AUTO_INDENT: Automatically indent elements when
* seriailizing. * seriailizing.
* @RAPTOR_OPTION_WRITER_AUTO_EMPTY: Automatically detect and * @RAPTOR_OPTION_WRITER_AUTO_EMPTY: Automatically detect and
* abbreviate empty elements when serializing. * abbreviate empty elements when serializing.
* @RAPTOR_OPTION_WRITER_INDENT_WIDTH: Integer number of spaces to use * @RAPTOR_OPTION_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_OPTION_WRITER_XML_VERSION: Integer XML version XML 1.0 (10) or X ML 1.1 (11) * @RAPTOR_OPTION_WRITER_XML_VERSION: Integer XML version XML 1.0 (10) or X ML 1.1 (11)
* @RAPTOR_OPTION_WRITER_XML_DECLARATION: Write XML 1.0 or 1.1 declaration. * @RAPTOR_OPTION_WRITER_XML_DECLARATION: Write XML 1.0 or 1.1 declaration.
* @RAPTOR_OPTION_NO_NET: Deny network requests. * @RAPTOR_OPTION_NO_NET: Deny network requests inside other requests.
* @RAPTOR_OPTION_RESOURCE_BORDER: Border color of resource * @RAPTOR_OPTION_RESOURCE_BORDER: Border color of resource
* nodes for GraphViz DOT serializer. * nodes for GraphViz DOT serializer.
* @RAPTOR_OPTION_LITERAL_BORDER: Border color of literal nodes * @RAPTOR_OPTION_LITERAL_BORDER: Border color of literal nodes
* for GraphViz DOT serializer. * for GraphViz DOT serializer.
* @RAPTOR_OPTION_BNODE_BORDER: Border color of blank nodes for * @RAPTOR_OPTION_BNODE_BORDER: Border color of blank nodes for
* GraphViz DOT serializer. * GraphViz DOT serializer.
* @RAPTOR_OPTION_RESOURCE_FILL: Fill color of resource nodes * @RAPTOR_OPTION_RESOURCE_FILL: Fill color of resource nodes
* for GraphViz DOT serializer. * for GraphViz DOT serializer.
* @RAPTOR_OPTION_LITERAL_FILL: Fill color of literal nodes for * @RAPTOR_OPTION_LITERAL_FILL: Fill color of literal nodes for
* GraphViz DOT serializer. * GraphViz DOT serializer.
skipping to change at line 515 skipping to change at line 515
* @RAPTOR_OPTION_WWW_HTTP_USER_AGENT: HTTP User-Agent: header * @RAPTOR_OPTION_WWW_HTTP_USER_AGENT: HTTP User-Agent: header
* @RAPTOR_OPTION_JSON_CALLBACK: JSON serializer callback function. * @RAPTOR_OPTION_JSON_CALLBACK: JSON serializer callback function.
* @RAPTOR_OPTION_JSON_EXTRA_DATA: JSON serializer extra top-level data * @RAPTOR_OPTION_JSON_EXTRA_DATA: JSON serializer extra top-level data
* @RAPTOR_OPTION_RSS_TRIPLES: Atom/RSS serializer writes extra RDF triples it finds (none, rdf-xml, atom-triples) * @RAPTOR_OPTION_RSS_TRIPLES: Atom/RSS serializer writes extra RDF triples it finds (none, rdf-xml, atom-triples)
* @RAPTOR_OPTION_ATOM_ENTRY_URI: Atom entry URI. If given, generate an At om Entry Document with the item having the given URI, otherwise generate an Atom Feed Document with any items found. * @RAPTOR_OPTION_ATOM_ENTRY_URI: Atom entry URI. If given, generate an At om Entry Document with the item having the given URI, otherwise generate an Atom Feed Document with any items found.
* @RAPTOR_OPTION_PREFIX_ELEMENTS: Integer. If set, generate Atom/RSS1.0 do cuments with prefixed elements, otherwise unprefixed. * @RAPTOR_OPTION_PREFIX_ELEMENTS: Integer. If set, generate Atom/RSS1.0 do cuments with prefixed elements, otherwise unprefixed.
* @RAPTOR_OPTION_STRICT: Boolean. If set, operate in strict conformance mo de. * @RAPTOR_OPTION_STRICT: Boolean. If set, operate in strict conformance mo de.
* @RAPTOR_OPTION_WWW_CERT_FILENAME: String. SSL client certificate filenam e * @RAPTOR_OPTION_WWW_CERT_FILENAME: String. SSL client certificate filenam e
* @RAPTOR_OPTION_WWW_CERT_TYPE: String. SSL client certificate type * @RAPTOR_OPTION_WWW_CERT_TYPE: String. SSL client certificate type
* @RAPTOR_OPTION_WWW_CERT_PASSPHRASE: String. SSL client certificate passp hrase * @RAPTOR_OPTION_WWW_CERT_PASSPHRASE: String. SSL client certificate passp hrase
* @RAPTOR_OPTION_WWW_SSL_VERIFY_PEER: Integer. SSL verify peer - non-0 to
verify peer SSL certificate (default)
* @RAPTOR_OPTION_WWW_SSL_VERIFY_HOST: Integer. SSL verify host - 0 none, 1
CN match, 2 host match (default). Other values are ignored.
* @RAPTOR_OPTION_NO_FILE: Deny file reading requests inside other requests
.
* @RAPTOR_OPTION_LOAD_EXTERNAL_ENTITIES: When reading XML, load external e
ntities.
* @RAPTOR_OPTION_LAST: Internal * @RAPTOR_OPTION_LAST: Internal
* *
* Raptor parser, serializer or XML writer options. * Raptor parser, serializer or XML writer options.
*/ */
typedef enum { typedef enum {
RAPTOR_OPTION_SCANNING, RAPTOR_OPTION_SCANNING,
RAPTOR_OPTION_ALLOW_NON_NS_ATTRIBUTES, RAPTOR_OPTION_ALLOW_NON_NS_ATTRIBUTES,
RAPTOR_OPTION_ALLOW_OTHER_PARSETYPES, RAPTOR_OPTION_ALLOW_OTHER_PARSETYPES,
RAPTOR_OPTION_ALLOW_BAGID, RAPTOR_OPTION_ALLOW_BAGID,
RAPTOR_OPTION_ALLOW_RDF_TYPE_RDF_LIST, RAPTOR_OPTION_ALLOW_RDF_TYPE_RDF_LIST,
skipping to change at line 558 skipping to change at line 562
RAPTOR_OPTION_WWW_HTTP_USER_AGENT, RAPTOR_OPTION_WWW_HTTP_USER_AGENT,
RAPTOR_OPTION_JSON_CALLBACK, RAPTOR_OPTION_JSON_CALLBACK,
RAPTOR_OPTION_JSON_EXTRA_DATA, RAPTOR_OPTION_JSON_EXTRA_DATA,
RAPTOR_OPTION_RSS_TRIPLES, RAPTOR_OPTION_RSS_TRIPLES,
RAPTOR_OPTION_ATOM_ENTRY_URI, RAPTOR_OPTION_ATOM_ENTRY_URI,
RAPTOR_OPTION_PREFIX_ELEMENTS, RAPTOR_OPTION_PREFIX_ELEMENTS,
RAPTOR_OPTION_STRICT, RAPTOR_OPTION_STRICT,
RAPTOR_OPTION_WWW_CERT_FILENAME, RAPTOR_OPTION_WWW_CERT_FILENAME,
RAPTOR_OPTION_WWW_CERT_TYPE, RAPTOR_OPTION_WWW_CERT_TYPE,
RAPTOR_OPTION_WWW_CERT_PASSPHRASE, RAPTOR_OPTION_WWW_CERT_PASSPHRASE,
RAPTOR_OPTION_LAST = RAPTOR_OPTION_WWW_CERT_PASSPHRASE RAPTOR_OPTION_NO_FILE,
RAPTOR_OPTION_WWW_SSL_VERIFY_PEER,
RAPTOR_OPTION_WWW_SSL_VERIFY_HOST,
RAPTOR_OPTION_LOAD_EXTERNAL_ENTITIES,
RAPTOR_OPTION_LAST = RAPTOR_OPTION_LOAD_EXTERNAL_ENTITIES
} raptor_option; } raptor_option;
/** /**
* raptor_term_literal_value: * raptor_term_literal_value:
* @string: literal string * @string: literal string
* @string_len: length of string * @string_len: length of string
* @datatype: datatype URI (or NULL) * @datatype: datatype URI (or NULL)
* @language: literal language (or NULL) * @language: literal language (or NULL)
* @language_len: length of language * @language_len: length of language
* *
skipping to change at line 1214 skipping to change at line 1222
raptor_uri* raptor_new_uri_from_counted_string(raptor_world* world, const u nsigned char *uri_string, size_t length); raptor_uri* raptor_new_uri_from_counted_string(raptor_world* world, const u nsigned char *uri_string, size_t length);
RAPTOR_API RAPTOR_API
raptor_uri* raptor_new_uri(raptor_world* world, const unsigned char *uri_st ring); raptor_uri* raptor_new_uri(raptor_world* world, const unsigned char *uri_st ring);
RAPTOR_API RAPTOR_API
raptor_uri* raptor_new_uri_from_uri_local_name(raptor_world* world, raptor_ uri *uri, const unsigned char *local_name); raptor_uri* raptor_new_uri_from_uri_local_name(raptor_world* world, raptor_ uri *uri, const unsigned char *local_name);
RAPTOR_API RAPTOR_API
raptor_uri* raptor_new_uri_relative_to_base(raptor_world* world, raptor_uri *base_uri, const unsigned char *uri_string); raptor_uri* raptor_new_uri_relative_to_base(raptor_world* world, raptor_uri *base_uri, const unsigned char *uri_string);
RAPTOR_API RAPTOR_API
raptor_uri* raptor_new_uri_from_id(raptor_world* world, raptor_uri *base_ur i, const unsigned char *id); raptor_uri* raptor_new_uri_from_id(raptor_world* world, raptor_uri *base_ur i, const unsigned char *id);
RAPTOR_API RAPTOR_API
raptor_uri* raptor_new_uri_from_uri_or_file_string(raptor_world* world, rap
tor_uri* base_uri, const unsigned char* uri_or_file_string);
RAPTOR_API
raptor_uri* raptor_new_uri_for_rdf_concept(raptor_world* world, const unsig ned char *name); raptor_uri* raptor_new_uri_for_rdf_concept(raptor_world* world, const unsig ned char *name);
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);
RAPTOR_API RAPTOR_API
raptor_uri* raptor_new_uri_for_retrieval(raptor_uri* old_uri); raptor_uri* raptor_new_uri_for_retrieval(raptor_uri* old_uri);
RAPTOR_API RAPTOR_API
void raptor_free_uri(raptor_uri *uri); void raptor_free_uri(raptor_uri *uri);
/* methods */ /* methods */
RAPTOR_API RAPTOR_API
skipping to change at line 1245 skipping to change at line 1255
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
int raptor_uri_print(const raptor_uri* uri, FILE *stream); int 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
raptor_world* raptor_uri_get_world(raptor_uri *uri); raptor_world* raptor_uri_get_world(raptor_uri *uri);
RAPTOR_API
int raptor_uri_file_exists(raptor_uri* uri);
/* XML utility functions */ /* XML utility functions */
RAPTOR_API RAPTOR_API
int raptor_xml_escape_string_any(raptor_world* world, const unsigned char * string, size_t len, unsigned char *buffer, size_t length, char quote, int x ml_version); int raptor_xml_escape_string_any(raptor_world* world, const unsigned char * string, size_t len, unsigned char *buffer, size_t length, char quote, int x ml_version);
RAPTOR_API RAPTOR_API
int raptor_xml_escape_string_any_write(const unsigned char *string, size_t len, char quote, int xml_version, raptor_iostream* iostr); int raptor_xml_escape_string_any_write(const unsigned char *string, size_t len, char quote, int xml_version, raptor_iostream* iostr);
RAPTOR_API RAPTOR_API
int raptor_xml_escape_string(raptor_world *world, const unsigned char *stri ng, size_t len, unsigned char *buffer, size_t length, char quote); int raptor_xml_escape_string(raptor_world *world, const unsigned char *stri ng, size_t len, unsigned char *buffer, size_t length, char quote);
RAPTOR_API RAPTOR_API
int raptor_xml_escape_string_write(const unsigned char *string, size_t len, char quote, raptor_iostream* iostr); int raptor_xml_escape_string_write(const unsigned char *string, size_t len, char quote, raptor_iostream* iostr);
skipping to change at line 1276 skipping to change at line 1288
int raptor_vasprintf(char **ret, const char *format, va_list arguments) RAP TOR_PRINTF_FORMAT(2, 0); int raptor_vasprintf(char **ret, const char *format, va_list arguments) RAP TOR_PRINTF_FORMAT(2, 0);
/* RFC2396 URI resolving functions */ /* RFC2396 URI resolving functions */
RAPTOR_API RAPTOR_API
size_t raptor_uri_resolve_uri_reference(const unsigned char *base_uri, cons t unsigned char *reference_uri, unsigned char* buffer, size_t length); size_t raptor_uri_resolve_uri_reference(const unsigned char *base_uri, cons t unsigned char *reference_uri, unsigned char* buffer, size_t length);
/* URI String utility functions */ /* URI String utility functions */
RAPTOR_API RAPTOR_API
unsigned char* raptor_uri_filename_to_uri_string(const char *filename); unsigned char* raptor_uri_filename_to_uri_string(const char *filename);
RAPTOR_API RAPTOR_API
int raptor_uri_filename_exists(const unsigned char* path);
RAPTOR_API
char* raptor_uri_uri_string_to_filename(const unsigned char *uri_string); char* raptor_uri_uri_string_to_filename(const unsigned char *uri_string);
RAPTOR_API RAPTOR_API
char* raptor_uri_uri_string_to_filename_fragment(const unsigned char *uri_s tring, unsigned char **fragment_p); char* raptor_uri_uri_string_to_filename_fragment(const unsigned char *uri_s tring, unsigned char **fragment_p);
RAPTOR_API RAPTOR_API
int raptor_uri_uri_string_is_file_uri(const unsigned char* uri_string); int raptor_uri_uri_string_is_file_uri(const unsigned char* uri_string);
RAPTOR_API RAPTOR_API
int raptor_stringbuffer_append_uri_escaped_counted_string(raptor_stringbuff er* sb, const char* string, size_t length, int space_is_plus); int raptor_stringbuffer_append_uri_escaped_counted_string(raptor_stringbuff er* sb, const char* string, size_t length, int space_is_plus);
RAPTOR_API
char* raptor_uri_uri_string_to_counted_filename_fragment(const unsigned cha
r *uri_string, size_t* len_p, unsigned char **fragment_p, size_t* fragment_
len_p);
/** /**
* 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.
*/ */
#define RAPTOR_RDF_MS_URI raptor_rdf_namespace_uri #define RAPTOR_RDF_MS_URI raptor_rdf_namespace_uri
skipping to change at line 1330 skipping to change at line 1346
/* raptor_www */ /* raptor_www */
RAPTOR_API RAPTOR_API
raptor_www* raptor_new_www(raptor_world* world); raptor_www* raptor_new_www(raptor_world* world);
RAPTOR_API RAPTOR_API
raptor_www* raptor_new_www_with_connection(raptor_world* world, void* conne ction); raptor_www* raptor_new_www_with_connection(raptor_world* world, void* conne ction);
RAPTOR_API RAPTOR_API
void raptor_free_www(raptor_www *www); void raptor_free_www(raptor_www *www);
RAPTOR_API RAPTOR_API
int raptor_www_set_ssl_cert_options(raptor_www* www, const char* cert_filen ame, const char* cert_type, const char* cert_passphrase); int raptor_www_set_ssl_cert_options(raptor_www* www, const char* cert_filen ame, const char* cert_type, const char* cert_passphrase);
RAPTOR_API RAPTOR_API
int raptor_www_set_ssl_verify_options(raptor_www* www, int verify_peer, int
verify_host);
RAPTOR_API
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
skipping to change at line 1921 skipping to change at line 1939
void raptor_sax2_set_cdata_handler(raptor_sax2* sax2, raptor_sax2_cdata_han dler handler); void raptor_sax2_set_cdata_handler(raptor_sax2* sax2, raptor_sax2_cdata_han dler handler);
RAPTOR_API RAPTOR_API
void raptor_sax2_set_comment_handler(raptor_sax2* sax2, raptor_sax2_comment _handler handler); void raptor_sax2_set_comment_handler(raptor_sax2* sax2, raptor_sax2_comment _handler handler);
RAPTOR_API RAPTOR_API
void raptor_sax2_set_unparsed_entity_decl_handler(raptor_sax2* sax2, raptor _sax2_unparsed_entity_decl_handler handler); void raptor_sax2_set_unparsed_entity_decl_handler(raptor_sax2* sax2, raptor _sax2_unparsed_entity_decl_handler handler);
RAPTOR_API RAPTOR_API
void raptor_sax2_set_external_entity_ref_handler(raptor_sax2* sax2, raptor_ sax2_external_entity_ref_handler handler); void raptor_sax2_set_external_entity_ref_handler(raptor_sax2* sax2, raptor_ sax2_external_entity_ref_handler handler);
RAPTOR_API RAPTOR_API
void raptor_sax2_set_namespace_handler(raptor_sax2* sax2, raptor_namespace_ handler handler); void raptor_sax2_set_namespace_handler(raptor_sax2* sax2, raptor_namespace_ handler handler);
RAPTOR_API RAPTOR_API
void raptor_sax2_set_uri_filter(raptor_sax2* sax2, raptor_uri_filter_func f
ilter, void *user_data);
RAPTOR_API
void raptor_sax2_parse_start(raptor_sax2 *sax2, raptor_uri *base_uri); void raptor_sax2_parse_start(raptor_sax2 *sax2, raptor_uri *base_uri);
RAPTOR_API RAPTOR_API
int raptor_sax2_parse_chunk(raptor_sax2* sax2, const unsigned char *buffer, size_t len, int is_end); int raptor_sax2_parse_chunk(raptor_sax2* sax2, const unsigned char *buffer, size_t len, int is_end);
RAPTOR_API RAPTOR_API
const unsigned char* raptor_sax2_inscope_xml_language(raptor_sax2* sax2); const unsigned char* raptor_sax2_inscope_xml_language(raptor_sax2* sax2);
RAPTOR_API RAPTOR_API
raptor_uri* raptor_sax2_inscope_base_uri(raptor_sax2* sax2); raptor_uri* raptor_sax2_inscope_base_uri(raptor_sax2* sax2);
/* AVL Trees */ /* AVL Trees */
 End of changes. 12 change blocks. 
5 lines changed or deleted 34 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/