| raptor.h | raptor.h | |||
|---|---|---|---|---|
| skipping to change at line 71 | skipping to change at line 71 | |||
| #ifdef __APPLE_CC__ | #ifdef __APPLE_CC__ | |||
| /* OSX gcc cpp-precomp is broken */ | /* OSX gcc cpp-precomp is broken */ | |||
| #define RAPTOR_DEPRECATED | #define RAPTOR_DEPRECATED | |||
| #else | #else | |||
| #define RAPTOR_DEPRECATED __attribute__((deprecated)) | #define RAPTOR_DEPRECATED __attribute__((deprecated)) | |||
| #endif | #endif | |||
| #else | #else | |||
| #define RAPTOR_DEPRECATED | #define RAPTOR_DEPRECATED | |||
| #endif | #endif | |||
| #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) | ||||
| #define RAPTOR_PRINTF_FORMAT(string_index, first_to_check_index) \ | ||||
| __attribute__((__format__(__printf__, string_index, first_to_check_index) | ||||
| )) | ||||
| #else | ||||
| #define RAPTOR_PRINTF_FORMAT(string_index, first_to_check_index) | ||||
| #endif | ||||
| /** | /** | |||
| * raptor_uri: | * raptor_uri: | |||
| * | * | |||
| * Raptor URI Class. | * Raptor URI Class. | |||
| */ | */ | |||
| typedef void* raptor_uri; | typedef void* raptor_uri; | |||
| /* Public statics */ | /* Public statics */ | |||
| RAPTOR_API | RAPTOR_API | |||
| extern const char * const raptor_short_copyright_string; | extern const char * const raptor_short_copyright_string; | |||
| skipping to change at line 194 | skipping to change at line 201 | |||
| * @Deprecated: use #raptor_parser. | * @Deprecated: use #raptor_parser. | |||
| * | * | |||
| * old structure - use #raptor_parser instead. | * old structure - use #raptor_parser instead. | |||
| */ | */ | |||
| typedef raptor_parser raptor_ntriples_parser; | typedef raptor_parser raptor_ntriples_parser; | |||
| /** | /** | |||
| * raptor_identifier_type: | * raptor_identifier_type: | |||
| * @RAPTOR_IDENTIFIER_TYPE_RESOURCE: Resource URI (e.g. <literal>rdf:abo ut</literal>) | * @RAPTOR_IDENTIFIER_TYPE_RESOURCE: Resource URI (e.g. <literal>rdf:abo ut</literal>) | |||
| * @RAPTOR_IDENTIFIER_TYPE_ANONYMOUS: <literal>_:foo</literal> N-Triples, or generated | * @RAPTOR_IDENTIFIER_TYPE_ANONYMOUS: <literal>_:foo</literal> N-Triples, or generated | |||
| * @RAPTOR_IDENTIFIER_TYPE_PREDICATE: predicate URI. WARNING: Will not b | * @RAPTOR_IDENTIFIER_TYPE_PREDICATE: predicate URI. WARNING: Will not b | |||
| e generated in in Raptor 1.4.9 or newer. Instead a #RAPTOR_IDENTIFIER_RESO | e generated in in Raptor 1.4.9 or newer. Instead a #RAPTOR_IDENTIFIER_TYPE | |||
| URCE will be returned. | _RESOURCE will be returned. | |||
| * @RAPTOR_IDENTIFIER_TYPE_ORDINAL: <literal>rdf:li</literal>, <literal | * @RAPTOR_IDENTIFIER_TYPE_ORDINAL: <literal>rdf:li</literal>, <literal | |||
| >rdf:_</literal><emphasis>n</emphasis>. No longer generated in any parser | >rdf:_</literal><emphasis>n</emphasis>. No longer generated in any parser | |||
| in Raptor 1.4.10+, instead a #RAPTOR_IDENTIFIER_RESOURCE is returned. | in Raptor 1.4.10+, instead a #RAPTOR_IDENTIFIER_TYPE_RESOURCE is returned. | |||
| * @RAPTOR_IDENTIFIER_TYPE_LITERAL: regular literal | * @RAPTOR_IDENTIFIER_TYPE_LITERAL: regular literal | |||
| * @RAPTOR_IDENTIFIER_TYPE_XML_LITERAL: <literal>rdf:parseType="Literal"</l iteral>. No longer generated by any parser in Raptor 1.4.8+, instead a #RA PTOR_IDENTIFIER_TYPE_LITERAL is returned with a datatype of <literal>rdf:XM LLiteral</literal>. | * @RAPTOR_IDENTIFIER_TYPE_XML_LITERAL: <literal>rdf:parseType="Literal"</l iteral>. No longer generated by any parser in Raptor 1.4.8+, instead a #RA PTOR_IDENTIFIER_TYPE_LITERAL is returned with a datatype of <literal>rdf:XM LLiteral</literal>. | |||
| * @RAPTOR_IDENTIFIER_TYPE_UNKNOWN: Internal | * @RAPTOR_IDENTIFIER_TYPE_UNKNOWN: Internal | |||
| * | * | |||
| * Type of identifier in a #raptor_statement | * Type of identifier in a #raptor_statement | |||
| * | * | |||
| */ | */ | |||
| typedef enum { | typedef enum { | |||
| RAPTOR_IDENTIFIER_TYPE_UNKNOWN, | RAPTOR_IDENTIFIER_TYPE_UNKNOWN, | |||
| RAPTOR_IDENTIFIER_TYPE_RESOURCE, | RAPTOR_IDENTIFIER_TYPE_RESOURCE, | |||
| skipping to change at line 877 | skipping to change at line 884 | |||
| RAPTOR_API | RAPTOR_API | |||
| int raptor_xml_any_escape_string(const unsigned char *string, size_t len, u nsigned char *buffer, size_t length, char quote, int xml_version, raptor_si mple_message_handler error_handler, void *error_data); | int raptor_xml_any_escape_string(const unsigned char *string, size_t len, u nsigned char *buffer, size_t length, char quote, int xml_version, raptor_si mple_message_handler error_handler, void *error_data); | |||
| RAPTOR_API | RAPTOR_API | |||
| int raptor_iostream_write_xml_any_escaped_string(raptor_iostream* iostr, co nst unsigned char *string, size_t len, char quote, int xml_version, raptor_ simple_message_handler error_handler, void *error_data); | int raptor_iostream_write_xml_any_escaped_string(raptor_iostream* iostr, co nst unsigned char *string, size_t len, char quote, int xml_version, raptor_ simple_message_handler error_handler, void *error_data); | |||
| RAPTOR_API | RAPTOR_API | |||
| int raptor_xml_escape_string(const unsigned char *string, size_t len, unsig ned char *buffer, size_t length, char quote, raptor_simple_message_handler error_handler, void *error_data); | int raptor_xml_escape_string(const unsigned char *string, size_t len, unsig ned char *buffer, size_t length, char quote, raptor_simple_message_handler error_handler, void *error_data); | |||
| RAPTOR_API | RAPTOR_API | |||
| int raptor_iostream_write_xml_escaped_string(raptor_iostream* iostr, const unsigned char *string, size_t len, char quote, raptor_simple_message_handle r error_handler, void *error_data); | int raptor_iostream_write_xml_escaped_string(raptor_iostream* iostr, const unsigned char *string, size_t len, char quote, raptor_simple_message_handle r error_handler, void *error_data); | |||
| RAPTOR_API | RAPTOR_API | |||
| char* raptor_vsnprintf(const char *message, va_list arguments); | char* raptor_vsnprintf(const char *message, va_list arguments) RAPTOR_PRINT F_FORMAT(1, 0); | |||
| RAPTOR_API | RAPTOR_API | |||
| int raptor_xml_name_check(const unsigned char *string, size_t length, int x ml_version); | int raptor_xml_name_check(const unsigned char *string, size_t length, int x ml_version); | |||
| /* raptor_rfc2396.c */ | /* raptor_rfc2396.c */ | |||
| RAPTOR_API | RAPTOR_API | |||
| void raptor_uri_resolve_uri_reference(const unsigned char *base_uri, const unsigned char *reference_uri, unsigned char* buffer, size_t length); | void raptor_uri_resolve_uri_reference(const unsigned char *base_uri, const unsigned char *reference_uri, unsigned char* buffer, size_t length); | |||
| /* raptor_uri.c */ | /* raptor_uri.c */ | |||
| RAPTOR_API | RAPTOR_API | |||
| End of changes. 3 change blocks. | ||||
| 7 lines changed or deleted | 15 lines changed or added | |||