raptor.h   raptor.h 
skipping to change at line 45 skipping to change at line 45
#include <stdarg.h> #include <stdarg.h>
/** /**
* RAPTOR_V2_AVAILABLE * RAPTOR_V2_AVAILABLE
* *
* Flag for marking raptor2 API availability. * Flag for marking raptor2 API availability.
*/ */
#define RAPTOR_V2_AVAILABLE 1 #define RAPTOR_V2_AVAILABLE 1
/** /**
* RAPTOR_VERSION:
*
* Raptor library version number
*
* Format: major * 10000 + minor * 100 + release
*/
#define RAPTOR_VERSION 10901
/**
* RAPTOR_VERSION_STRING:
*
* Raptor library version string
*/
#define RAPTOR_VERSION_STRING "1.9.1"
/**
* RAPTOR_VERSION_MAJOR:
*
* Raptor library major version
*/
#define RAPTOR_VERSION_MAJOR 1
/**
* RAPTOR_VERSION_MINOR:
*
* Raptor library minor version
*/
#define RAPTOR_VERSION_MINOR 9
/**
* RAPTOR_VERSION_RELEASE:
*
* Raptor library release
*/
#define RAPTOR_VERSION_RELEASE 1
/**
* 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__
# undef _declspec # undef _declspec
# define _declspec(x) __declspec(x) # define _declspec(x) __declspec(x)
skipping to change at line 74 skipping to change at line 111
# endif # endif
# else # else
# define RAPTOR_API # define RAPTOR_API
# endif # endif
#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__
/* OSX gcc cpp-precomp is broken */
#define RAPTOR_DEPRECATED
#else
#define RAPTOR_DEPRECATED __attribute__((deprecated)) #define RAPTOR_DEPRECATED __attribute__((deprecated))
#endif
#else #else
#define RAPTOR_DEPRECATED #define RAPTOR_DEPRECATED
#endif #endif
/** /**
* RAPTOR_PRINTF_FORMAT: * RAPTOR_PRINTF_FORMAT:
* @string_index: ignore me * @string_index: ignore me
* @first_to_check_index: ignore me * @first_to_check_index: ignore me
* *
* Internal macro * Internal macro
skipping to change at line 587 skipping to change at line 619
RAPTOR_DOMAIN_TURTLE_WRITER, RAPTOR_DOMAIN_TURTLE_WRITER,
RAPTOR_DOMAIN_URI, RAPTOR_DOMAIN_URI,
RAPTOR_DOMAIN_WORLD, RAPTOR_DOMAIN_WORLD,
RAPTOR_DOMAIN_WWW, RAPTOR_DOMAIN_WWW,
RAPTOR_DOMAIN_XML_WRITER, RAPTOR_DOMAIN_XML_WRITER,
RAPTOR_DOMAIN_LAST = RAPTOR_DOMAIN_XML_WRITER RAPTOR_DOMAIN_LAST = RAPTOR_DOMAIN_XML_WRITER
} raptor_domain; } raptor_domain;
/** /**
* raptor_log_message: * raptor_log_message:
* @code: error code or <0 * @code: error code or < 0 if not used or known
* @domain: message domain or RAPTOR_DOMAIN_NONE * @domain: message domain or #RAPTOR_DOMAIN_NONE if not used or known
* @level: log level * @level: log message level
* @locator: location associated with message or NULL * @locator: location associated with message or NULL if not known
* @text: message string * @text: message string
* *
* Log message. * Log message.
*/ */
typedef struct { typedef struct {
int code; int code;
raptor_domain domain; raptor_domain domain;
raptor_log_level level; raptor_log_level level;
raptor_locator *locator; raptor_locator *locator;
const char *text; const char *text;
skipping to change at line 832 skipping to change at line 864
* @fh: FILE* to print to * @fh: FILE* to print to
* *
* Function function for printing an object with data context to a stream. * Function function for printing an object with data context to a stream.
* *
* Set by raptor_new_sequence_with_context() * Set by raptor_new_sequence_with_context()
* *
* Return value: non-0 on failure * Return value: non-0 on failure
*/ */
typedef int (*raptor_data_context_print_handler)(void *context, void *objec t, FILE *fh); typedef int (*raptor_data_context_print_handler)(void *context, void *objec t, FILE *fh);
/**
* raptor_stringbuffer:
*
* Raptor string buffer class
*/
typedef struct raptor_stringbuffer_s raptor_stringbuffer;
/* Public functions */ /* Public functions */
#define raptor_new_world() raptor_new_world_internal(RAPTOR_VERSION)
/* The real target of the raptor_new_world() macro */
RAPTOR_API RAPTOR_API
raptor_world* raptor_new_world(void); raptor_world *raptor_new_world_internal(unsigned int version_decimal);
RAPTOR_API RAPTOR_API
int raptor_world_open(raptor_world* world); int raptor_world_open(raptor_world* world);
RAPTOR_API RAPTOR_API
void raptor_free_world(raptor_world* world); void raptor_free_world(raptor_world* world);
RAPTOR_API RAPTOR_API
int raptor_world_set_libxslt_security_preferences(raptor_world *world, void *security_preferences); int raptor_world_set_libxslt_security_preferences(raptor_world *world, void *security_preferences);
RAPTOR_API RAPTOR_API
int raptor_world_set_flag(raptor_world *world, raptor_world_flag flag, int value); int raptor_world_set_flag(raptor_world *world, raptor_world_flag flag, int value);
RAPTOR_API RAPTOR_API
int raptor_world_set_log_handler(raptor_world *world, void *user_data, rapt or_log_handler handler); int raptor_world_set_log_handler(raptor_world *world, void *user_data, rapt or_log_handler handler);
skipping to change at line 876 skipping to change at line 917
const raptor_syntax_description* raptor_world_get_serializer_description(ra ptor_world* world, unsigned int counter); const raptor_syntax_description* raptor_world_get_serializer_description(ra ptor_world* world, unsigned int counter);
RAPTOR_API RAPTOR_API
int raptor_world_is_serializer_name(raptor_world* world, const char *name); int raptor_world_is_serializer_name(raptor_world* world, const char *name);
RAPTOR_API RAPTOR_API
raptor_option raptor_world_get_option_from_uri(raptor_world* world, raptor_ uri *uri); raptor_option raptor_world_get_option_from_uri(raptor_world* world, raptor_ uri *uri);
/* Term Class */ /* Term Class */
RAPTOR_API RAPTOR_API
raptor_term* raptor_new_term_from_uri(raptor_world* world, raptor_uri* uri) ; raptor_term* raptor_new_term_from_uri(raptor_world* world, raptor_uri* uri) ;
RAPTOR_API RAPTOR_API
raptor_term* raptor_new_term_from_counted_uri_string(raptor_world* world,
const unsigned char *uri_string, size_t length);
RAPTOR_API
raptor_term* raptor_new_term_from_uri_string(raptor_world* world, const uns
igned char *uri_string);
RAPTOR_API
raptor_term* raptor_new_term_from_literal(raptor_world* world, const unsign ed char* literal, raptor_uri* datatype, const unsigned char* language); raptor_term* raptor_new_term_from_literal(raptor_world* world, const unsign ed char* literal, raptor_uri* datatype, const unsigned char* language);
RAPTOR_API RAPTOR_API
raptor_term* raptor_new_term_from_counted_literal(raptor_world* world, cons t unsigned char* literal, size_t literal_len, raptor_uri* datatype, const u nsigned char* language, unsigned char language_len); raptor_term* raptor_new_term_from_counted_literal(raptor_world* world, cons t unsigned char* literal, size_t literal_len, raptor_uri* datatype, const u nsigned char* language, unsigned char language_len);
RAPTOR_API RAPTOR_API
raptor_term* raptor_new_term_from_blank(raptor_world* world, const unsigned char* blank); raptor_term* raptor_new_term_from_blank(raptor_world* world, const unsigned char* blank);
RAPTOR_API RAPTOR_API
raptor_term* raptor_new_term_from_counted_blank(raptor_world* world, const unsigned char* blank, size_t length); raptor_term* raptor_new_term_from_counted_blank(raptor_world* world, const unsigned char* blank, size_t length);
RAPTOR_API RAPTOR_API
raptor_term* raptor_term_copy(raptor_term* term); raptor_term* raptor_term_copy(raptor_term* term);
RAPTOR_API RAPTOR_API
int raptor_term_compare(const raptor_term *t1, const raptor_term *t2); int raptor_term_compare(const raptor_term *t1, const raptor_term *t2);
RAPTOR_API RAPTOR_API
int raptor_term_equals(raptor_term* t1, raptor_term* t2); int raptor_term_equals(raptor_term* t1, raptor_term* t2);
RAPTOR_API RAPTOR_API
void raptor_free_term(raptor_term *term); void raptor_free_term(raptor_term *term);
RAPTOR_API RAPTOR_API
unsigned char* raptor_term_as_counted_string(raptor_term *term, size_t* len _p); unsigned char* raptor_term_to_counted_string(raptor_term *term, size_t* len _p);
RAPTOR_API RAPTOR_API
unsigned char* raptor_term_as_string(raptor_term *term); unsigned char* raptor_term_to_string(raptor_term *term);
RAPTOR_API RAPTOR_API
int raptor_term_ntriples_write(const raptor_term *term, raptor_iostream* io str); int raptor_term_ntriples_write(const raptor_term *term, raptor_iostream* io str);
/* Statement Class */ /* Statement Class */
RAPTOR_API RAPTOR_API
void raptor_statement_init(raptor_statement *statement, raptor_world *world ); void raptor_statement_init(raptor_statement *statement, raptor_world *world );
RAPTOR_API RAPTOR_API
void raptor_statement_clear(raptor_statement *statement); void raptor_statement_clear(raptor_statement *statement);
RAPTOR_API RAPTOR_API
raptor_statement* raptor_new_statement(raptor_world *world); raptor_statement* raptor_new_statement(raptor_world *world);
skipping to change at line 1120 skipping to change at line 1165
/* 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
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
int raptor_stringbuffer_append_uri_escaped_counted_string(raptor_stringbuff
er* sb, const char* string, size_t length, int space_is_plus);
/** /**
* 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 1275 skipping to change at line 1322
const unsigned char* raptor_namespace_get_counted_prefix(const raptor_names pace *ns, size_t *length_p); const unsigned char* raptor_namespace_get_counted_prefix(const raptor_names pace *ns, size_t *length_p);
RAPTOR_API RAPTOR_API
unsigned char* raptor_namespace_format_as_xml(const raptor_namespace *ns, s ize_t *length_p); unsigned char* raptor_namespace_format_as_xml(const raptor_namespace *ns, s ize_t *length_p);
RAPTOR_API RAPTOR_API
int raptor_namespace_write(raptor_namespace *ns, raptor_iostream* iostr); int raptor_namespace_write(raptor_namespace *ns, raptor_iostream* iostr);
/* namespace string utility function */ /* namespace string utility function */
RAPTOR_API RAPTOR_API
int raptor_xml_namespace_string_parse(const unsigned char *string, unsigned char **prefix, unsigned char **uri_string); int raptor_xml_namespace_string_parse(const unsigned char *string, unsigned char **prefix, unsigned char **uri_string);
/**
* raptor_stringbuffer:
*
* Raptor string buffer class
*/
typedef struct raptor_stringbuffer_s raptor_stringbuffer;
/* Sequence class */ /* Sequence class */
/** /**
* raptor_sequence: * raptor_sequence:
* *
* Raptor sequence class * Raptor sequence class
*/ */
typedef struct raptor_sequence_s raptor_sequence; typedef struct raptor_sequence_s raptor_sequence;
/* Sequence Class */ /* Sequence Class */
RAPTOR_API RAPTOR_API
skipping to change at line 1362 skipping to change at line 1402
void raptor_free_stringbuffer(raptor_stringbuffer *stringbuffer); void raptor_free_stringbuffer(raptor_stringbuffer *stringbuffer);
/* methods */ /* methods */
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);
RAPTOR_API RAPTOR_API
int raptor_stringbuffer_append_string(raptor_stringbuffer* stringbuffer, co nst unsigned char *string, int do_copy); int raptor_stringbuffer_append_string(raptor_stringbuffer* stringbuffer, co nst unsigned char *string, int do_copy);
RAPTOR_API RAPTOR_API
int raptor_stringbuffer_append_decimal(raptor_stringbuffer* stringbuffer, i nt integer); int raptor_stringbuffer_append_decimal(raptor_stringbuffer* stringbuffer, i nt integer);
RAPTOR_API RAPTOR_API
int raptor_stringbuffer_append_hexadecimal(raptor_stringbuffer* stringbuffe
r, int hex);
RAPTOR_API
int raptor_stringbuffer_append_stringbuffer(raptor_stringbuffer* stringbuff er, raptor_stringbuffer* append); int raptor_stringbuffer_append_stringbuffer(raptor_stringbuffer* stringbuff er, raptor_stringbuffer* append);
RAPTOR_API RAPTOR_API
int raptor_stringbuffer_prepend_counted_string(raptor_stringbuffer* stringb uffer, const unsigned char *string, size_t length, int do_copy); int raptor_stringbuffer_prepend_counted_string(raptor_stringbuffer* stringb uffer, const unsigned char *string, size_t length, int do_copy);
RAPTOR_API RAPTOR_API
int raptor_stringbuffer_prepend_string(raptor_stringbuffer* stringbuffer, c onst unsigned char *string, int do_copy); int raptor_stringbuffer_prepend_string(raptor_stringbuffer* stringbuffer, c onst unsigned char *string, int do_copy);
RAPTOR_API RAPTOR_API
unsigned char* raptor_stringbuffer_as_string(raptor_stringbuffer* stringbuf fer); unsigned char* raptor_stringbuffer_as_string(raptor_stringbuffer* stringbuf fer);
RAPTOR_API RAPTOR_API
size_t raptor_stringbuffer_length(raptor_stringbuffer* stringbuffer); size_t raptor_stringbuffer_length(raptor_stringbuffer* stringbuffer);
RAPTOR_API RAPTOR_API
 End of changes. 13 change blocks. 
19 lines changed or deleted 65 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/