From fbd7575e56f2349c5bb0fca249dffc25125042e4 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 16 Feb 2011 00:14:25 +0000 Subject: Remove unused node user data. git-svn-id: http://svn.drobilla.net/sord/trunk@25 3d64ff67-21c5-427c-a301-fe4f08042e5a --- src/sord.c | 23 ----------------------- src/sord_internal.h | 13 ++++++------- 2 files changed, 6 insertions(+), 30 deletions(-) (limited to 'src') 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 -- cgit v1.2.1