raptor.h   raptor.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 10901 #define RAPTOR_VERSION 20000
/** /**
* RAPTOR_VERSION_STRING: * RAPTOR_VERSION_STRING:
* *
* Raptor library version string * Raptor library version string
*/ */
#define RAPTOR_VERSION_STRING "1.9.1" #define RAPTOR_VERSION_STRING "2.0.0"
/** /**
* RAPTOR_VERSION_MAJOR: * RAPTOR_VERSION_MAJOR:
* *
* Raptor library major version * Raptor library major version
*/ */
#define RAPTOR_VERSION_MAJOR 1 #define RAPTOR_VERSION_MAJOR 2
/** /**
* RAPTOR_VERSION_MINOR: * RAPTOR_VERSION_MINOR:
* *
* Raptor library minor version * Raptor library minor version
*/ */
#define RAPTOR_VERSION_MINOR 9 #define RAPTOR_VERSION_MINOR 0
/** /**
* RAPTOR_VERSION_RELEASE: * RAPTOR_VERSION_RELEASE:
* *
* Raptor library release * Raptor library release
*/ */
#define RAPTOR_VERSION_RELEASE 1 #define RAPTOR_VERSION_RELEASE 0
/** /**
* 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 284 skipping to change at line 284
* *
* Bit flags for #raptor_syntax_description flags field * Bit flags for #raptor_syntax_description flags field
*/ */
typedef enum { typedef enum {
RAPTOR_SYNTAX_NEED_BASE_URI = 1 RAPTOR_SYNTAX_NEED_BASE_URI = 1
} raptor_syntax_bitflags; } raptor_syntax_bitflags;
/** /**
* raptor_syntax_description: * raptor_syntax_description:
* @names: array of syntax names - the first one (required) is the public n ame, the rest are aliases. The array is NULL terminated. * @names: array of syntax names - the first one (required) is the public n ame, the rest are aliases. The array is NULL terminated.
* @names_count: size of @names array
* @label: long descriptive label for syntax * @label: long descriptive label for syntax
* @mime_types: Array of (MIME type, Q) values associated with the syntax ( or NULL). If present the array is NULL terminated. * @mime_types: Array of (MIME type, Q) values associated with the syntax ( or NULL). If present the array is NULL terminated.
* @mime_types_count: size of @mime_types array (or 0) * @mime_types_count: size of @mime_types array
* @uri_string: URI identifying the syntax (or NULL) * @uri_strings: array of URIs identifying the syntax (or NULL). The first
one if present is the main URI, the rest are aliases. The array is NULL te
rminated.
* @uri_strings_count: size of @uri_strings array
* @flags: See #raptor_syntax_bitflags for the bits * @flags: See #raptor_syntax_bitflags for the bits
* *
* Description of a syntax or file format. * Description of a syntax or file format.
* *
*/ */
typedef struct { typedef struct {
const char* const* names; const char* const* names;
unsigned int names_count;
const char* label; const char* label;
const raptor_type_q* mime_types; const raptor_type_q* mime_types;
unsigned int mime_types_count; unsigned int mime_types_count;
const char* uri_string; const char* const* uri_strings;
unsigned int uri_strings_count;
unsigned int flags; unsigned int flags;
} raptor_syntax_description; } raptor_syntax_description;
/** /**
* raptor_term_type: * raptor_term_type:
* @RAPTOR_TERM_TYPE_URI: RDF URI * @RAPTOR_TERM_TYPE_URI: RDF URI
* @RAPTOR_TERM_TYPE_LITERAL: RDF literal * @RAPTOR_TERM_TYPE_LITERAL: RDF literal
* @RAPTOR_TERM_TYPE_BLANK: RDF blank node * @RAPTOR_TERM_TYPE_BLANK: RDF blank node
* @RAPTOR_TERM_TYPE_UNKNOWN: Internal * @RAPTOR_TERM_TYPE_UNKNOWN: Internal
skipping to change at line 898 skipping to change at line 902
void raptor_world_set_generate_bnodeid_handler(raptor_world* world, void *u ser_data, raptor_generate_bnodeid_handler handler); void raptor_world_set_generate_bnodeid_handler(raptor_world* world, void *u ser_data, raptor_generate_bnodeid_handler handler);
RAPTOR_API RAPTOR_API
unsigned char* raptor_world_generate_bnodeid(raptor_world *world); unsigned char* raptor_world_generate_bnodeid(raptor_world *world);
RAPTOR_API RAPTOR_API
void raptor_world_set_generate_bnodeid_parameters(raptor_world* world, char *prefix, int base); void raptor_world_set_generate_bnodeid_parameters(raptor_world* world, char *prefix, int base);
RAPTOR_API RAPTOR_API
const char* raptor_log_level_get_label(raptor_log_level level); const char* raptor_log_level_get_label(raptor_log_level level);
RAPTOR_API RAPTOR_API
const char* raptor_domain_get_label(raptor_domain domain); const char* raptor_domain_get_label(raptor_domain domain);
/* Parser names */ /* Names */
RAPTOR_API
const raptor_syntax_description* raptor_world_get_parser_description(raptor
_world* world, unsigned int counter);
RAPTOR_API RAPTOR_API
int raptor_world_is_parser_name(raptor_world* world, const char *name); int raptor_world_is_parser_name(raptor_world* world, const char *name);
RAPTOR_API RAPTOR_API
const char* raptor_world_guess_parser_name(raptor_world* world, raptor_uri *uri, const char *mime_type, const unsigned char *buffer, size_t len, const unsigned char *identifier); const char* raptor_world_guess_parser_name(raptor_world* world, raptor_uri *uri, const char *mime_type, const unsigned char *buffer, size_t len, const unsigned char *identifier);
RAPTOR_API
int raptor_world_is_serializer_name(raptor_world* world, const char *name);
/* Syntax descriptions */
RAPTOR_API
const raptor_syntax_description* raptor_world_get_parser_description(raptor
_world* world, unsigned int counter);
RAPTOR_API RAPTOR_API
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_syntax_description_validate(raptor_syntax_description* desc);
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_term* raptor_new_term_from_counted_uri_string(raptor_world* world, const unsigned char *uri_string, size_t length);
RAPTOR_API RAPTOR_API
raptor_term* raptor_new_term_from_uri_string(raptor_world* world, const uns igned char *uri_string); raptor_term* raptor_new_term_from_uri_string(raptor_world* world, const uns igned char *uri_string);
 End of changes. 13 change blocks. 
13 lines changed or deleted 23 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/