aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-11-04 14:52:18 +0000
committerDavid Robillard <d@drobilla.net>2011-11-04 14:52:18 +0000
commit2eec748dbf865725d414dbbd57454e1cd6db87e7 (patch)
tree99e0fc618e7fe8d625baa0de42ec8019d3b2d930 /src
parent21a48e6814edce845cd2bd03f9f1d7d6ae234c66 (diff)
downloadserd-2eec748dbf865725d414dbbd57454e1cd6db87e7.tar.gz
serd-2eec748dbf865725d414dbbd57454e1cd6db87e7.tar.bz2
serd-2eec748dbf865725d414dbbd57454e1cd6db87e7.zip
Move serd_strlen and serd_strerror to string.c and document both in "String Utilities" section.
git-svn-id: http://svn.drobilla.net/serd/trunk@229 490d8e77-9747-427b-9fa3-0b8f29cee8a0
Diffstat (limited to 'src')
-rw-r--r--src/node.c26
-rw-r--r--src/string.c (renamed from src/error.c)25
2 files changed, 25 insertions, 26 deletions
diff --git a/src/node.c b/src/node.c
index 2e908c69..224bf407 100644
--- a/src/node.c
+++ b/src/node.c
@@ -20,32 +20,6 @@
#include "serd_internal.h"
SERD_API
-size_t
-serd_strlen(const uint8_t* str, size_t* n_bytes, SerdNodeFlags* flags)
-{
- size_t n_chars = 0;
- size_t i = 0;
- for (; str[i]; ++i) {
- if ((str[i] & 0xC0) != 0x80) {
- // Does not start with `10', start of a new character
- ++n_chars;
- switch (str[i]) {
- case '\r':
- case '\n':
- *flags |= SERD_HAS_NEWLINE;
- break;
- case '"':
- *flags |= SERD_HAS_QUOTE;
- }
- }
- }
- if (n_bytes) {
- *n_bytes = i;
- }
- return n_chars;
-}
-
-SERD_API
SerdNode
serd_node_from_string(SerdType type, const uint8_t* buf)
{
diff --git a/src/error.c b/src/string.c
index cfab5a77..f747c530 100644
--- a/src/error.c
+++ b/src/string.c
@@ -31,3 +31,28 @@ serd_strerror(SerdStatus st)
return (const uint8_t*)"Success"; // never reached
}
+SERD_API
+size_t
+serd_strlen(const uint8_t* str, size_t* n_bytes, SerdNodeFlags* flags)
+{
+ size_t n_chars = 0;
+ size_t i = 0;
+ for (; str[i]; ++i) {
+ if ((str[i] & 0xC0) != 0x80) {
+ // Does not start with `10', start of a new character
+ ++n_chars;
+ switch (str[i]) {
+ case '\r':
+ case '\n':
+ *flags |= SERD_HAS_NEWLINE;
+ break;
+ case '"':
+ *flags |= SERD_HAS_QUOTE;
+ }
+ }
+ }
+ if (n_bytes) {
+ *n_bytes = i;
+ }
+ return n_chars;
+}