Remove unused node user data.

git-svn-id: http://svn.drobilla.net/sord/trunk@25 3d64ff67-21c5-427c-a301-fe4f08042e5a

3 files changed, 10 insertions, 47 deletions

diff --git a/sord/sord.h b/sord/sord.h
index 8c92a5c..41c23cf 100644
--- a/sord/sord.h
+++ b/sord/sord.h
@@ -109,11 +109,6 @@ sord_free(Sord sord);
  * @{
  */
 
-/** Set the free function for node opaque user data. */
-SORD_API
-void
-sord_node_set_user_data_free_function(Sord sord, void (*f)(void*));
-
 /** Dereference an ID, loading node data into memory.
  * The returned node is allocated memory owned by @a sord,
  * it can only be freed by the caller via sord_clear_cache.
@@ -126,10 +121,10 @@ sord_node_load(Sord sord, SordID id);
 SORD_API
 void
 sord_quad_load(Sord      sord,
-                SordQuad  tup,
-                SordNode* s,
-                SordNode* p,
-                SordNode* o);
+               SordQuad  tup,
+               SordNode* s,
+               SordNode* p,
+               SordNode* o);
 
 /** Find a URI, creating a new one if necessary iff @a create is true.
  * Use sord_get_uri_counted instead if the length of @a str is known.
@@ -191,14 +186,6 @@ SORD_API
 const uint8_t*
 sord_node_get_string_counted(SordNode node, size_t* len);
 
-/** Set an opaque user pointer on a node.
- * Sord does not interpret the user pointer in any way, but it will be
- * preserved on the node until the cache is cleared.
- */
-SORD_API
-void
-sord_node_set_user_data(SordNode node, void* user_data);
-
 /** Get the opaque user pointer on a node. */
 SORD_API
 void*
diff --git a/src/sord.c b/src/sord.c
index f475561..f4209f7 100644
--- a/src/sord.c
+++ b/src/sord.c
@@ -117,8 +117,6 @@ struct _Sord {
 	 */
 	GSequence* indices[NUM_ORDERS];
 
-	void (*user_data_free)(void*); ///< Destructor for node user data
-
 	SordCount n_quads;
 	SordCount n_nodes;
 };
@@ -543,8 +541,6 @@ sord_new(unsigned indices, bool graphs)
 	sord->n_quads  = 0;
 	sord->n_nodes  = 0;
 
-	sord->user_data_free = NULL;
-
 	for (unsigned i = 0; i < (NUM_ORDERS / 2); ++i) {
 		if (indices & (1 << i)) {
 			sord->indices[i] = g_sequence_new(free);
@@ -632,12 +628,6 @@ sord_num_nodes(Sord sord)
 	return sord->n_nodes;
 }
 
-void
-sord_node_set_user_data_free_function(Sord sord, void (*f)(void*))
-{
-	sord->user_data_free = f;
-}
-
 SordIter
 sord_begin(Sord sord)
 {
@@ -764,7 +754,6 @@ sord_new_node(SordNodeType type, const uint8_t* data, size_t n_bytes)
 	node->type      = type;
 	node->n_bytes   = n_bytes;
 	node->refs      = 0;
-	node->user_data = 0;
 	node->datatype  = 0;
 	node->lang      = 0;
 	node->buf       = (uint8_t*)g_strdup((const char*)data); // TODO: no-copy
@@ -822,18 +811,6 @@ sord_node_get_string_counted(SordNode ref, size_t* n_bytes)
 	return ref->buf;
 }
 
-void
-sord_node_set_user_data(SordNode ref, void* user_data)
-{
-	ref->user_data = user_data;
-}
-
-void*
-sord_node_get_user_data(SordNode ref)
-{
-	return ref->user_data;
-}
-
 const char*
 sord_literal_get_lang(SordNode ref)
 {
diff --git a/src/sord_internal.h b/src/sord_internal.h
index c38843d..86ee958 100644
--- a/src/sord_internal.h
+++ b/src/sord_internal.h
@@ -25,13 +25,12 @@
 
 /** Node */
 struct _SordNode {
-	SordNodeType type;       ///< SordNodeType
-	size_t       n_bytes;    ///< Length of data in bytes (including terminator)
-	SordCount    refs;       ///< Reference count (i.e. number of containing quads)
-	void*        user_data;  ///< Opaque user data
-	SordNode     datatype;   ///< Literal data type (ID of a URI node, or 0)
-	const char*  lang;       ///< Literal language (interned string)
-	uint8_t*     buf;        ///< Value (string)
+	SordNodeType type;      ///< SordNodeType
+	size_t       n_bytes;   ///< Length of data in bytes (including terminator)
+	SordCount    refs;      ///< Reference count (i.e. number of containing quads)
+	SordNode     datatype;  ///< Literal data type (ID of a URI node, or 0)
+	const char*  lang;      ///< Literal language (interned string)
+	uint8_t*     buf;       ///< Value (string)
 };
 
 #endif // SORD_INTERNAL_H