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 20014 #define RAPTOR_VERSION 20015
/** /**
* RAPTOR_VERSION_STRING: * RAPTOR_VERSION_STRING:
* *
* Raptor library version string * Raptor library version string
*/ */
#define RAPTOR_VERSION_STRING "2.0.14" #define RAPTOR_VERSION_STRING "2.0.15"
/** /**
* 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 14 #define RAPTOR_VERSION_RELEASE 15
/** /**
* 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 905 skipping to change at line 905
* *
*/ */
typedef enum { typedef enum {
RAPTOR_WORLD_FLAG_LIBXML_GENERIC_ERROR_SAVE = 1, RAPTOR_WORLD_FLAG_LIBXML_GENERIC_ERROR_SAVE = 1,
RAPTOR_WORLD_FLAG_LIBXML_STRUCTURED_ERROR_SAVE = 2, RAPTOR_WORLD_FLAG_LIBXML_STRUCTURED_ERROR_SAVE = 2,
RAPTOR_WORLD_FLAG_URI_INTERNING = 3, RAPTOR_WORLD_FLAG_URI_INTERNING = 3,
RAPTOR_WORLD_FLAG_WWW_SKIP_INIT_FINISH = 4 RAPTOR_WORLD_FLAG_WWW_SKIP_INIT_FINISH = 4
} raptor_world_flag; } raptor_world_flag;
/** /**
* raptor_data_compare_arg_handler:
* @data1: first object
* @data2: second object
* @user_data: user data argument
*
* Function to compare two data objects with a user data argument
*
* Designed to be used with raptor_sort_r() and compatible functions
* such as raptor_sequence_sort_r() which uses it.
*
* Return value: compare value <0 if @data1 is before @data2, =0 if equal,
>0 if @data1 is after @data2
*/
typedef int (*raptor_data_compare_arg_handler)(const void *data1, const voi
d *data2, void *user_data);
/**
* raptor_data_compare_handler: * raptor_data_compare_handler:
* @data1: first data object * @data1: first data object
* @data2: second data object * @data2: second data object
* *
* Function to compare two data objects - signature like strcmp() and funct ion pssed to qsort() * Function to compare two data objects - signature like strcmp() and funct ion pssed to qsort()
* *
* Designed to be passed into generic data structure constructors * Designed to be passed into generic data structure constructors
* like raptor_new_avltree(). * like raptor_new_avltree().
* *
* Return value: compare value <0 if @data1 is before @data2, =0 if equal, >0 if @data1 is after @data2 * Return value: compare value <0 if @data1 is before @data2, =0 if equal, >0 if @data1 is after @data2
skipping to change at line 1024 skipping to change at line 1039
/* Names */ /* Names */
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 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);
/* Syntax descriptions */ /* Syntax descriptions */
RAPTOR_API RAPTOR_API
int raptor_world_get_parsers_count(raptor_world* world);
RAPTOR_API
int raptor_world_get_serializers_count(raptor_world* world);
RAPTOR_API
const raptor_syntax_description* raptor_world_get_parser_description(raptor _world* world, unsigned int counter); 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_syntax_description_validate(raptor_syntax_description* desc); 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 */
skipping to change at line 1523 skipping to change at line 1542
RAPTOR_API RAPTOR_API
void* raptor_sequence_pop(raptor_sequence* seq); void* raptor_sequence_pop(raptor_sequence* seq);
RAPTOR_API RAPTOR_API
void* raptor_sequence_unshift(raptor_sequence* seq); void* raptor_sequence_unshift(raptor_sequence* seq);
RAPTOR_API RAPTOR_API
void* raptor_sequence_delete_at(raptor_sequence* seq, int idx); void* raptor_sequence_delete_at(raptor_sequence* seq, int idx);
RAPTOR_API RAPTOR_API
void raptor_sequence_sort(raptor_sequence* seq, raptor_data_compare_handler compare); void raptor_sequence_sort(raptor_sequence* seq, raptor_data_compare_handler compare);
RAPTOR_API RAPTOR_API
void raptor_sequence_sort_r(raptor_sequence* seq, raptor_data_compare_arg_h
andler compare, void* user_data);
RAPTOR_API
int raptor_sequence_swap(raptor_sequence* seq, int i, int j); int raptor_sequence_swap(raptor_sequence* seq, int i, int j);
RAPTOR_API RAPTOR_API
int raptor_sequence_reverse(raptor_sequence* seq, int start_index, int leng th); int raptor_sequence_reverse(raptor_sequence* seq, int start_index, int leng th);
RAPTOR_API RAPTOR_API
int raptor_sequence_next_permutation(raptor_sequence *seq, raptor_data_comp are_handler compare); int raptor_sequence_next_permutation(raptor_sequence *seq, raptor_data_comp are_handler compare);
/* helper for printing sequences of strings */ /* helper for printing sequences of strings */
RAPTOR_API RAPTOR_API
int raptor_sequence_print(raptor_sequence* seq, FILE* fh); int raptor_sequence_print(raptor_sequence* seq, FILE* fh);
RAPTOR_API RAPTOR_API
skipping to change at line 2099 skipping to change at line 2120
RAPTOR_API RAPTOR_API
void raptor_free_avltree_iterator(raptor_avltree_iterator* iterator); void raptor_free_avltree_iterator(raptor_avltree_iterator* iterator);
RAPTOR_API RAPTOR_API
int raptor_avltree_iterator_is_end(raptor_avltree_iterator* iterator); int raptor_avltree_iterator_is_end(raptor_avltree_iterator* iterator);
RAPTOR_API RAPTOR_API
int raptor_avltree_iterator_next(raptor_avltree_iterator* iterator); int raptor_avltree_iterator_next(raptor_avltree_iterator* iterator);
RAPTOR_API RAPTOR_API
void* raptor_avltree_iterator_get(raptor_avltree_iterator* iterator); void* raptor_avltree_iterator_get(raptor_avltree_iterator* iterator);
/* utility methods */
void raptor_sort_r(void *base, size_t nel, size_t width, raptor_data_compar
e_arg_handler compar, void *user_data);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 7 change blocks. 
3 lines changed or deleted 31 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/