summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-04-23 21:27:52 +0000
committerDavid Robillard <d@drobilla.net>2011-04-23 21:27:52 +0000
commit9ad2e0bdec306d80357a642271fbde1f8f02ec45 (patch)
tree699965c7dede97a0943ec3f252b6a4d68743353e
parent978e99c6034845c01adb440811e0951f8215f6bb (diff)
downloadsord-9ad2e0bdec306d80357a642271fbde1f8f02ec45.tar.gz
sord-9ad2e0bdec306d80357a642271fbde1f8f02ec45.tar.bz2
sord-9ad2e0bdec306d80357a642271fbde1f8f02ec45.zip
Improve node struct alignment
git-svn-id: http://svn.drobilla.net/sord/trunk@84 3d64ff67-21c5-427c-a301-fe4f08042e5a
-rw-r--r--sord/sordmm.hpp2
-rw-r--r--src/sord_internal.h8
-rw-r--r--src/sordi.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/sord/sordmm.hpp b/sord/sordmm.hpp
index e643207..e56cce3 100644
--- a/sord/sordmm.hpp
+++ b/sord/sordmm.hpp
@@ -58,7 +58,7 @@ public:
static inline SerdNode string_to_node(SerdType type, const std::string& s) {
SerdNode ret = {
- type, s.length() + 1, s.length(), (const uint8_t*)s.c_str() };
+ (const uint8_t*)s.c_str(), s.length() + 1, s.length(), type };
return ret;
}
diff --git a/src/sord_internal.h b/src/sord_internal.h
index 4e8892e..7d62e54 100644
--- a/src/sord_internal.h
+++ b/src/sord_internal.h
@@ -26,12 +26,12 @@ typedef intptr_t SordCount; ///< Count of nodes or triples
/** Node */
struct _SordNode {
- SordNodeType type; ///< SordNodeType
+ uint8_t* buf; ///< Value (string)
+ const char* lang; ///< Literal language (interned string)
+ SordNode datatype; ///< Literal data type (ID of a URI node, or 0)
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)
+ SordNodeType type; ///< SordNodeType
};
#endif /* SORD_SORD_INTERNAL_H_ */
diff --git a/src/sordi.c b/src/sordi.c
index 3382cda..6f4539a 100644
--- a/src/sordi.c
+++ b/src/sordi.c
@@ -65,7 +65,7 @@ serd_node_from_sord_node(const SordNode n)
{
size_t n_bytes = 0;
const uint8_t* buf = sord_node_get_string_counted(n, &n_bytes);
- SerdNode sn = { SERD_NOTHING, n_bytes, n_bytes - 1, (const uint8_t*)buf };
+ SerdNode sn = { (const uint8_t*)buf, n_bytes, n_bytes - 1, SERD_NOTHING };
// FIXME: UTF-8
switch (sord_node_get_type(n)) {
case SORD_URI: