librdf.h   librdf.h 
/* -*- Mode: c; c-basic-offset: 2 -*- /* -*- Mode: c; c-basic-offset: 2 -*-
* *
* redland.h - Redland RDF Application Framework public API * redland.h - Redland RDF Application Framework public API
* *
* Copyright (C) 2000-2010, David Beckett http://www.dajobe.org/ * Copyright (C) 2000-2011, David Beckett http://www.dajobe.org/
* Copyright (C) 2000-2005, University of Bristol, UK http://www.bristol.ac .uk/ * Copyright (C) 2000-2005, University of Bristol, UK http://www.bristol.ac .uk/
* *
* This package is Free Software and part of Redland http://librdf.org/ * This package is Free Software and part of Redland http://librdf.org/
* *
* It is licensed under the following three licenses as alternatives: * It is licensed under the following three licenses as alternatives:
* 1. GNU Lesser General Public License (LGPL) V2.1 or any newer version * 1. GNU Lesser General Public License (LGPL) V2.1 or any newer version
* 2. GNU General Public License (GPL) V2 or any newer version * 2. GNU General Public License (GPL) V2 or any newer version
* 3. Apache License, V2.0 or any newer version * 3. Apache License, V2.0 or any newer version
* *
* You may not use this file except in compliance with at least one of * You may not use this file except in compliance with at least one of
skipping to change at line 89 skipping to change at line 89
#define REDLAND_DEPRECATED #define REDLAND_DEPRECATED
#endif #endif
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
#define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index) \ #define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index) \
__attribute__((__format__(__printf__, string_index, first_to_check_index) )) __attribute__((__format__(__printf__, string_index, first_to_check_index) ))
#else #else
#define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index) #define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index)
#endif #endif
/* Use raptor_uris in place of librdf_uris for raptor2 */ /* Public defines */
#ifdef RAPTOR_V2_AVAILABLE
#define LIBRDF_USE_RAPTOR_URI 1 /**
#define LIBRDF_USE_RAPTOR_TERM 1 * LIBRDF_VERSION:
#define LIBRDF_USE_RAPTOR_STATEMENT 1 *
#else * Redland librdf library version number
#undef LIBRDF_USE_RAPTOR_URI *
#undef LIBRDF_USE_RAPTOR_TERM * Format: major * 10000 + minor * 100 + release
#undef LIBRDF_USE_RAPTOR_STATEMENT */
#endif #define LIBRDF_VERSION 10013
/**
* LIBRDF_VERSION_STRING:
*
* Redland librdf library version string
*/
#define LIBRDF_VERSION_STRING "1.0.13"
/**
* LIBRDF_VERSION_MAJOR:
*
* Redland librdf library major version
*/
#define LIBRDF_VERSION_MAJOR 1
/**
* LIBRDF_VERSION_MINOR:
*
* Redland librdf library minor version
*/
#define LIBRDF_VERSION_MINOR 0
/**
* LIBRDF_VERSION_RELEASE:
*
* Redland librdf library release
*/
#define LIBRDF_VERSION_RELEASE 13
/* Public typedefs (references to private structures) */ /* Public typedefs (references to private structures) */
/** /**
* librdf_world: * librdf_world:
* *
* Redland world class. * Redland world class.
*/ */
typedef struct librdf_world_s librdf_world; typedef struct librdf_world_s librdf_world;
skipping to change at line 142 skipping to change at line 170
* *
* Redland digest factory class. * Redland digest factory class.
*/ */
typedef struct librdf_digest_factory_s librdf_digest_factory; typedef struct librdf_digest_factory_s librdf_digest_factory;
/** /**
* librdf_uri: * librdf_uri:
* *
* Redland URI class. * Redland URI class.
*/ */
#ifdef LIBRDF_USE_RAPTOR_URI
typedef struct raptor_uri_s librdf_uri; typedef struct raptor_uri_s librdf_uri;
#else
typedef struct librdf_uri_s librdf_uri;
#endif
/** /**
* librdf_list: * librdf_list:
* *
* Redland list class. * Redland list class.
*/ */
typedef struct librdf_list_s librdf_list; typedef struct librdf_list_s librdf_list;
/** /**
* librdf_iterator: * librdf_iterator:
* *
* Redland iterator class. * Redland iterator class.
*/ */
typedef struct librdf_iterator_s librdf_iterator; typedef struct librdf_iterator_s librdf_iterator;
/** /**
* librdf_node: * librdf_node:
* *
* Redland node class. * Redland node class.
*/ */
#ifdef LIBRDF_USE_RAPTOR_TERM
typedef raptor_term librdf_node; typedef raptor_term librdf_node;
#else
typedef struct librdf_node_s librdf_node;
#endif
/** /**
* librdf_statement: * librdf_statement:
* *
* Redland statement class. * Redland statement class.
*/ */
#ifdef LIBRDF_USE_RAPTOR_STATEMENT
typedef raptor_statement librdf_statement; typedef raptor_statement librdf_statement;
#else
typedef struct librdf_statement_s librdf_statement;
#endif
/** /**
* librdf_model: * librdf_model:
* *
* Redland model class. * Redland model class.
*/ */
typedef struct librdf_model_s librdf_model; typedef struct librdf_model_s librdf_model;
/** /**
* librdf_model_factory: * librdf_model_factory:
 End of changes. 8 change blocks. 
23 lines changed or deleted 39 lines changed or added


 rdf_log.h   rdf_log.h 
skipping to change at line 77 skipping to change at line 77
* @LIBRDF_FROM_PARSER: Parser * @LIBRDF_FROM_PARSER: Parser
* @LIBRDF_FROM_QUERY: Query * @LIBRDF_FROM_QUERY: Query
* @LIBRDF_FROM_SERIALIZER: Serializer * @LIBRDF_FROM_SERIALIZER: Serializer
* @LIBRDF_FROM_STATEMENT: Statement * @LIBRDF_FROM_STATEMENT: Statement
* @LIBRDF_FROM_STORAGE: Storage * @LIBRDF_FROM_STORAGE: Storage
* @LIBRDF_FROM_STREAM: Stream * @LIBRDF_FROM_STREAM: Stream
* @LIBRDF_FROM_URI: URI * @LIBRDF_FROM_URI: URI
* @LIBRDF_FROM_UTF8: UTF8 * @LIBRDF_FROM_UTF8: UTF8
* @LIBRDF_FROM_MEMORY: Memory * @LIBRDF_FROM_MEMORY: Memory
* @LIBRDF_FROM_NONE: Associated with no part. * @LIBRDF_FROM_NONE: Associated with no part.
* @LIBRDF_FROM_RAPTOR: Raptor library (parser or serializer; raptor2 and l ater). * @LIBRDF_FROM_RAPTOR: Raptor library (parser or serializer; Raptor 2.0.0+ ).
* @LIBRDF_FROM_LAST: Internal, never returned. * @LIBRDF_FROM_LAST: Internal, never returned.
* *
* Indicates the part of the system that generated the log message. * Indicates the part of the system that generated the log message.
*/ */
typedef enum { typedef enum {
LIBRDF_FROM_NONE = 0, LIBRDF_FROM_NONE = 0,
LIBRDF_FROM_CONCEPTS, LIBRDF_FROM_CONCEPTS,
LIBRDF_FROM_DIGEST, LIBRDF_FROM_DIGEST,
LIBRDF_FROM_FILES, LIBRDF_FROM_FILES,
LIBRDF_FROM_HASH, LIBRDF_FROM_HASH,
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 rdf_node.h   rdf_node.h 
skipping to change at line 62 skipping to change at line 62
* XML space * XML space
* @LIBRDF_NODE_TYPE_BLANK: blank node has an identifier string. * @LIBRDF_NODE_TYPE_BLANK: blank node has an identifier string.
* @LIBRDF_NODE_TYPE_LAST: Internal * @LIBRDF_NODE_TYPE_LAST: Internal
* *
* Type of a redland node. * Type of a redland node.
* *
* Better to check this with functions librdf_node_is_resource(), * Better to check this with functions librdf_node_is_resource(),
* librdf_node_is_literal() or librdf_node_is_blank(). * librdf_node_is_literal() or librdf_node_is_blank().
* *
*/ */
#ifdef LIBRDF_USE_RAPTOR_TERM
typedef enum { typedef enum {
LIBRDF_NODE_TYPE_UNKNOWN = RAPTOR_TERM_TYPE_UNKNOWN, LIBRDF_NODE_TYPE_UNKNOWN = RAPTOR_TERM_TYPE_UNKNOWN,
LIBRDF_NODE_TYPE_RESOURCE = RAPTOR_TERM_TYPE_URI, LIBRDF_NODE_TYPE_RESOURCE = RAPTOR_TERM_TYPE_URI,
LIBRDF_NODE_TYPE_LITERAL = RAPTOR_TERM_TYPE_LITERAL, LIBRDF_NODE_TYPE_LITERAL = RAPTOR_TERM_TYPE_LITERAL,
LIBRDF_NODE_TYPE_BLANK = RAPTOR_TERM_TYPE_BLANK, LIBRDF_NODE_TYPE_BLANK = RAPTOR_TERM_TYPE_BLANK,
LIBRDF_NODE_TYPE_LAST = LIBRDF_NODE_TYPE_BLANK LIBRDF_NODE_TYPE_LAST = LIBRDF_NODE_TYPE_BLANK
} librdf_node_type; } librdf_node_type;
#else
typedef enum {
LIBRDF_NODE_TYPE_UNKNOWN = 0, /* To catch uninitialised nodes */
LIBRDF_NODE_TYPE_RESOURCE = 1, /* rdf:Resource (& rdf:Property) - has a
URI */
LIBRDF_NODE_TYPE_LITERAL = 2, /* rdf:Literal - has an XML string, lang
uage, XML space */
/* node type 3 is unused at present. Do not renumber this list. */
LIBRDF_NODE_TYPE_BLANK = 4, /* blank node has an identifier string *
/
LIBRDF_NODE_TYPE_LAST = LIBRDF_NODE_TYPE_BLANK
} librdf_node_type;
#endif
#ifdef LIBRDF_INTERNAL #ifdef LIBRDF_INTERNAL
#include <rdf_node_internal.h> #include <rdf_node_internal.h>
#endif #endif
/* Create a new Node. */ /* Create a new Node. */
REDLAND_API REDLAND_API
librdf_node* librdf_new_node(librdf_world* world); librdf_node* librdf_new_node(librdf_world* world);
/* Create a new resource Node from URI string. */ /* Create a new resource Node from URI string. */
skipping to change at line 174 skipping to change at line 163
REDLAND_API REDLAND_API
int librdf_node_is_blank(librdf_node* node); int librdf_node_is_blank(librdf_node* node);
/* serialise / deserialise */ /* serialise / deserialise */
REDLAND_API REDLAND_API
size_t librdf_node_encode(librdf_node* node, unsigned char *buffer, size_t length); size_t librdf_node_encode(librdf_node* node, unsigned char *buffer, size_t length);
REDLAND_API REDLAND_API
librdf_node* librdf_node_decode(librdf_world *world, size_t* size_p, unsign ed char *buffer, size_t length); librdf_node* librdf_node_decode(librdf_world *world, size_t* size_p, unsign ed char *buffer, size_t length);
/* convert to a string */ /* convert to a string */
REDLAND_API REDLAND_API REDLAND_DEPRECATED
unsigned char *librdf_node_to_string(librdf_node* node); unsigned char *librdf_node_to_string(librdf_node* node);
REDLAND_API REDLAND_DEPRECATED REDLAND_API REDLAND_DEPRECATED
unsigned char* librdf_node_to_counted_string(librdf_node* node, size_t* len _p); unsigned char* librdf_node_to_counted_string(librdf_node* node, size_t* len _p);
/* pretty print it */ /* pretty print it */
REDLAND_API REDLAND_API
int librdf_node_write(librdf_node* node, raptor_iostream *iostr); int librdf_node_write(librdf_node* node, raptor_iostream *iostr);
REDLAND_API REDLAND_API
void librdf_node_print(librdf_node* node, FILE *fh); void librdf_node_print(librdf_node* node, FILE *fh);
 End of changes. 3 change blocks. 
15 lines changed or deleted 1 lines changed or added


 rdf_parser.h   rdf_parser.h 
skipping to change at line 40 skipping to change at line 40
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* class methods */ /* class methods */
REDLAND_API REDLAND_API
void librdf_parser_register_factory(librdf_world *world, const char *name, const char *label, const char *mime_type, const unsigned char *uri_string, void (*factory) (librdf_parser_factory*)); void librdf_parser_register_factory(librdf_world *world, const char *name, const char *label, const char *mime_type, const unsigned char *uri_string, void (*factory) (librdf_parser_factory*));
REDLAND_API REDLAND_API REDLAND_DEPRECATED
int librdf_parser_enumerate(librdf_world* world, const unsigned int counter , const char **name, const char **label); int librdf_parser_enumerate(librdf_world* world, const unsigned int counter , const char **name, const char **label);
REDLAND_API REDLAND_API
const raptor_syntax_description* librdf_parser_get_description(librdf_world
* world, unsigned int counter);
REDLAND_API
int librdf_parser_check_name(librdf_world* world, const char *name); int librdf_parser_check_name(librdf_world* world, const char *name);
/* constructor */ /* constructor */
REDLAND_API REDLAND_API
librdf_parser* librdf_new_parser(librdf_world* world, const char *name, con st char *mime_type, librdf_uri *type_uri); librdf_parser* librdf_new_parser(librdf_world* world, const char *name, con st char *mime_type, librdf_uri *type_uri);
REDLAND_API REDLAND_API
librdf_parser* librdf_new_parser_from_factory(librdf_world* world, librdf_p arser_factory *factory); librdf_parser* librdf_new_parser_from_factory(librdf_world* world, librdf_p arser_factory *factory);
/* destructor */ /* destructor */
REDLAND_API REDLAND_API
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 rdf_query.h   rdf_query.h 
skipping to change at line 132 skipping to change at line 132
librdf_query_results_formatter* librdf_new_query_results_formatter(librdf_q uery_results* query_results, const char *name, librdf_uri* uri); librdf_query_results_formatter* librdf_new_query_results_formatter(librdf_q uery_results* query_results, const char *name, librdf_uri* uri);
REDLAND_API REDLAND_DEPRECATED REDLAND_API REDLAND_DEPRECATED
librdf_query_results_formatter* librdf_new_query_results_formatter_by_mime_ type(librdf_query_results* query_results, const char *mime_type); librdf_query_results_formatter* librdf_new_query_results_formatter_by_mime_ type(librdf_query_results* query_results, const char *mime_type);
REDLAND_API REDLAND_API
void librdf_free_query_results_formatter(librdf_query_results_formatter* fo rmatter); void librdf_free_query_results_formatter(librdf_query_results_formatter* fo rmatter);
REDLAND_API REDLAND_API
int librdf_query_results_formatter_write(raptor_iostream *iostr, librdf_que ry_results_formatter* formatter, librdf_query_results* query_results, librd f_uri *base_uri); int librdf_query_results_formatter_write(raptor_iostream *iostr, librdf_que ry_results_formatter* formatter, librdf_query_results* query_results, librd f_uri *base_uri);
REDLAND_API REDLAND_API
int librdf_query_results_formats_check(librdf_world* world, const char *nam e, librdf_uri* uri, const char *mime_type); int librdf_query_results_formats_check(librdf_world* world, const char *nam e, librdf_uri* uri, const char *mime_type);
REDLAND_API REDLAND_API REDLAND_DEPRECATED
int librdf_query_results_formats_enumerate(librdf_world* world, const unsig ned int counter, const char **name, const char **label, const unsigned char **uri_string, const char **mime_type); int librdf_query_results_formats_enumerate(librdf_world* world, const unsig ned int counter, const char **name, const char **label, const unsigned char **uri_string, const char **mime_type);
REDLAND_API
const raptor_syntax_description* librdf_query_results_formats_get_descripti
on(librdf_world* world, unsigned int counter);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 rdf_serializer.h   rdf_serializer.h 
skipping to change at line 42 skipping to change at line 42
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <raptor.h> #include <raptor.h>
/* class methods */ /* class methods */
REDLAND_API REDLAND_API
void librdf_serializer_register_factory(librdf_world *world, const char *na me, const char *label, const char *mime_type, const unsigned char *uri_stri ng, void (*factory) (librdf_serializer_factory*)); void librdf_serializer_register_factory(librdf_world *world, const char *na me, const char *label, const char *mime_type, const unsigned char *uri_stri ng, void (*factory) (librdf_serializer_factory*));
REDLAND_API REDLAND_API REDLAND_DEPRECATED
int librdf_serializer_enumerate(librdf_world* world, const unsigned int cou nter, const char **name, const char **label); int librdf_serializer_enumerate(librdf_world* world, const unsigned int cou nter, const char **name, const char **label);
REDLAND_API REDLAND_API
const raptor_syntax_description* librdf_serializer_get_description(librdf_w
orld* world, unsigned int counter);
REDLAND_API
int librdf_serializer_check_name(librdf_world* world, const char *name); int librdf_serializer_check_name(librdf_world* world, const char *name);
/* constructor */ /* constructor */
REDLAND_API REDLAND_API
librdf_serializer* librdf_new_serializer(librdf_world* world, const char *n ame, const char *mime_type, librdf_uri *type_uri); librdf_serializer* librdf_new_serializer(librdf_world* world, const char *n ame, const char *mime_type, librdf_uri *type_uri);
REDLAND_API REDLAND_API
librdf_serializer* librdf_new_serializer_from_factory(librdf_world* world, librdf_serializer_factory *factory); librdf_serializer* librdf_new_serializer_from_factory(librdf_world* world, librdf_serializer_factory *factory);
/* destructor */ /* destructor */
REDLAND_API REDLAND_API
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 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/