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 20009 #define RAPTOR_VERSION 20010
/** /**
* RAPTOR_VERSION_STRING: * RAPTOR_VERSION_STRING:
* *
* Raptor library version string * Raptor library version string
*/ */
#define RAPTOR_VERSION_STRING "2.0.9" #define RAPTOR_VERSION_STRING "2.0.10"
/** /**
* 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 9 #define RAPTOR_VERSION_RELEASE 10
/** /**
* 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 1062 skipping to change at line 1062
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_to_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_to_string(raptor_term *term); unsigned char* raptor_term_to_string(raptor_term *term);
RAPTOR_API RAPTOR_API
int raptor_term_escaped_write(const raptor_term *term, unsigned int flags,
raptor_iostream* iostr);
RAPTOR_API RAPTOR_DEPRECATED
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);
RAPTOR_API RAPTOR_API
int raptor_uri_turtle_write(raptor_world *world, raptor_iostream* iostr, ra ptor_uri* uri, raptor_namespace_stack *nstack, raptor_uri *base_uri); int raptor_uri_turtle_write(raptor_world *world, raptor_iostream* iostr, ra ptor_uri* uri, raptor_namespace_stack *nstack, raptor_uri *base_uri);
RAPTOR_API RAPTOR_API
int raptor_term_turtle_write(raptor_iostream* iostr, raptor_term* term, rap tor_namespace_stack *nstack, raptor_uri *base_uri); int raptor_term_turtle_write(raptor_iostream* iostr, raptor_term* term, rap tor_namespace_stack *nstack, raptor_uri *base_uri);
RAPTOR_API RAPTOR_API
unsigned char* raptor_uri_to_turtle_counted_string(raptor_world *world, rap tor_uri* uri, raptor_namespace_stack *nstack, raptor_uri *base_uri, size_t *len_p); unsigned char* raptor_uri_to_turtle_counted_string(raptor_world *world, rap tor_uri* uri, raptor_namespace_stack *nstack, raptor_uri *base_uri, size_t *len_p);
RAPTOR_API RAPTOR_API
unsigned char* raptor_uri_to_turtle_string(raptor_world *world, raptor_uri* uri, raptor_namespace_stack *nstack, raptor_uri *base_uri); unsigned char* raptor_uri_to_turtle_string(raptor_world *world, raptor_uri* uri, raptor_namespace_stack *nstack, raptor_uri *base_uri);
RAPTOR_API RAPTOR_API
skipping to change at line 1273 skipping to change at line 1275
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 RAPTOR_API
int raptor_uri_file_exists(raptor_uri* uri); int raptor_uri_file_exists(raptor_uri* uri);
RAPTOR_API
int raptor_uri_escaped_write(raptor_uri* uri, raptor_uri* base_uri, unsigne
d int flags, raptor_iostream *iostr);
/* 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 1731 skipping to change at line 1735
RAPTOR_API RAPTOR_API
int raptor_stringbuffer_write(raptor_stringbuffer *sb, raptor_iostream* ios tr); int raptor_stringbuffer_write(raptor_stringbuffer *sb, raptor_iostream* ios tr);
RAPTOR_API RAPTOR_API
int raptor_uri_write(raptor_uri *uri, raptor_iostream *iostr); int raptor_uri_write(raptor_uri *uri, raptor_iostream *iostr);
RAPTOR_API RAPTOR_API
int raptor_iostream_read_bytes(void *ptr, size_t size, size_t nmemb, raptor _iostream* iostr); int raptor_iostream_read_bytes(void *ptr, size_t size, size_t nmemb, raptor _iostream* iostr);
RAPTOR_API RAPTOR_API
int raptor_iostream_read_eof(raptor_iostream *iostr); int raptor_iostream_read_eof(raptor_iostream *iostr);
/* I/O Stream utility functions */ /* I/O Stream utility functions */
/**
* raptor_escaped_write_bitflags:
* @RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_BF : Allow \b \f,
* @RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_TNRU : ALlow \t \n \r \u
* @RAPTOR_ESCAPED_WRITE_BITFLAG_UTF8 : Allow UTF-8 for printabl
e U *
* @RAPTOR_ESCAPED_WRITE_BITFLAG_SPARQL_URI_ESCAPES: Must escape #x00-#x20<
>\"{}|^` in URIs
* @RAPTOR_ESCAPED_WRITE_NTRIPLES_LITERAL: N-Triples literal
* @RAPTOR_ESCAPED_WRITE_NTRIPLES_URI: N-Triples URI
* @RAPTOR_ESCAPED_WRITE_SPARQL_LITERAL: SPARQL literal: allows raw UTF8 fo
r printable literals
* @RAPTOR_ESCAPED_WRITE_SPARQL_LONG_LITERAL: SPARQL long literal: no BS-es
capes allowed
* @RAPTOR_ESCAPED_WRITE_SPARQL_URI: SPARQL uri: have to escape certain cha
racters
* @RAPTOR_ESCAPED_WRITE_TURTLE_URI: Turtle 2013 URIs (like SPARQL)
* @RAPTOR_ESCAPED_WRITE_TURTLE_LITERAL: Turtle 2013 literals (like SPARQL)
* @RAPTOR_ESCAPED_WRITE_TURTLE_LONG_LITERAL: Turtle 2013 long literals (li
ke SPARQL)
* @RAPTOR_ESCAPED_WRITE_JSON_LITERAL: JSON literals: \b \f \t \r \n and \u
\U
*
* Bit flags for raptor_string_escaped_write() and friends.
*/
typedef enum {
RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_BF = 1,
RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_TNRU = 2,
RAPTOR_ESCAPED_WRITE_BITFLAG_UTF8 = 4,
RAPTOR_ESCAPED_WRITE_BITFLAG_SPARQL_URI_ESCAPES = 8,
/* N-Triples - favour writing \u, \U over UTF8 */
RAPTOR_ESCAPED_WRITE_NTRIPLES_LITERAL = RAPTOR_ESCAPED_WRITE_BITFLAG_BS_E
SCAPES_TNRU | RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_BF,
RAPTOR_ESCAPED_WRITE_NTRIPLES_URI = RAPTOR_ESCAPED_WRITE_BITFLAG_SPAR
QL_URI_ESCAPES,
/* SPARQL literal: allows raw UTF8 for printable literals */
RAPTOR_ESCAPED_WRITE_SPARQL_LITERAL = RAPTOR_ESCAPED_WRITE_BITFLAG_UTF8,
/* SPARQL long literal: no BS-escapes allowed */
RAPTOR_ESCAPED_WRITE_SPARQL_LONG_LITERAL = RAPTOR_ESCAPED_WRITE_BITFLAG_U
TF8,
/* SPARQL uri: have to escape certain characters */
RAPTOR_ESCAPED_WRITE_SPARQL_URI = RAPTOR_ESCAPED_WRITE_BITFLAG_UTF8 |
RAPTOR_ESCAPED_WRITE_BITFLAG_SPARQL_URI_ESCAPES,
/* Turtle (2013) escapes are like SPARQL */
RAPTOR_ESCAPED_WRITE_TURTLE_URI = RAPTOR_ESCAPED_WRITE_SPARQL_URI,
RAPTOR_ESCAPED_WRITE_TURTLE_LITERAL = RAPTOR_ESCAPED_WRITE_SPARQL_LITERAL
,
RAPTOR_ESCAPED_WRITE_TURTLE_LONG_LITERAL = RAPTOR_ESCAPED_WRITE_SPARQL_LO
NG_LITERAL,
/* JSON literals: \b \f \t \r \n and \u \U */
RAPTOR_ESCAPED_WRITE_JSON_LITERAL = RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAP
ES_TNRU | RAPTOR_ESCAPED_WRITE_BITFLAG_BS_ESCAPES_BF
} raptor_escaped_write_bitflags;
RAPTOR_API RAPTOR_API
int raptor_string_ntriples_write(const unsigned char *string, size_t len, c onst char delim, raptor_iostream *iostr); int raptor_string_ntriples_write(const unsigned char *string, size_t len, c onst char delim, raptor_iostream *iostr);
RAPTOR_API RAPTOR_API
int raptor_bnodeid_ntriples_write(const unsigned char *bnodeid, size_t len, raptor_iostream *iostr); int raptor_bnodeid_ntriples_write(const unsigned char *bnodeid, size_t len, raptor_iostream *iostr);
RAPTOR_API RAPTOR_API RAPTOR_DEPRECATED
int raptor_string_python_write(const unsigned char *string, size_t len, con int raptor_string_python_write(const unsigned char *string, size_t len, con
st char delim, int flags, raptor_iostream *iostr); st char delim, unsigned int mode, raptor_iostream *iostr);
RAPTOR_API RAPTOR_API
int raptor_statement_ntriples_write(const raptor_statement *statement, rapt or_iostream* iostr, int write_graph_term); int raptor_statement_ntriples_write(const raptor_statement *statement, rapt or_iostream* iostr, int write_graph_term);
RAPTOR_API
int raptor_string_escaped_write(const unsigned char *string, size_t len, co
nst char delim, unsigned int flags, raptor_iostream *iostr);
/* Parser and Serializer options */ /* Parser and Serializer options */
/** /**
* raptor_option_value_type: * raptor_option_value_type:
* @RAPTOR_OPTION_VALUE_TYPE_BOOL: Boolean integer value. Non-0 is true * @RAPTOR_OPTION_VALUE_TYPE_BOOL: Boolean integer value. Non-0 is true
* @RAPTOR_OPTION_VALUE_TYPE_INT: Decimal integer value * @RAPTOR_OPTION_VALUE_TYPE_INT: Decimal integer value
* @RAPTOR_OPTION_VALUE_TYPE_STRING: String value * @RAPTOR_OPTION_VALUE_TYPE_STRING: String value
* @RAPTOR_OPTION_VALUE_TYPE_URI: URI String value. * @RAPTOR_OPTION_VALUE_TYPE_URI: URI String value.
* @RAPTOR_OPTION_VALUE_TYPE_LAST: internal * @RAPTOR_OPTION_VALUE_TYPE_LAST: internal
 End of changes. 8 change blocks. 
6 lines changed or deleted 76 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/