aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2016-07-07 23:50:39 -0400
committerDavid Robillard <d@drobilla.net>2018-12-30 17:56:22 -0500
commit86681fbf464d47f8962238d472a7d521643d5dd6 (patch)
treec104bd7552c5c5373af092c5d043001e72aa3efb
parentcedc9530cee8518f92d949984d173be1e707e31e (diff)
downloadserd-86681fbf464d47f8962238d472a7d521643d5dd6.tar.gz
serd-86681fbf464d47f8962238d472a7d521643d5dd6.tar.bz2
serd-86681fbf464d47f8962238d472a7d521643d5dd6.zip
Make serd_strtod API const-correct
This is an API breakage, but a minor one (particularly since NULL is allowed) that avoids the flaw in the C API.
-rw-r--r--serd/serd.h8
-rw-r--r--src/reader.c2
-rw-r--r--src/reader.h2
-rw-r--r--src/serd_internal.h2
-rw-r--r--src/string.c6
-rw-r--r--tests/serd_test.c6
6 files changed, 15 insertions, 11 deletions
diff --git a/serd/serd.h b/serd/serd.h
index 3895f93d..5c28aa50 100644
--- a/serd/serd.h
+++ b/serd/serd.h
@@ -316,13 +316,15 @@ serd_strlen(const char* str, SerdNodeFlags* flags);
/**
Parse a string to a double.
- The API of this function is identical to the standard C strtod function,
+ The API of this function is similar to the standard C strtod function,
except this function is locale-independent and always matches the lexical
- format used in the Turtle grammar (the decimal point is always ".").
+ format used in the Turtle grammar (the decimal point is always "."). The
+ end parameter is an offset from the start of `str` to avoid the
+ const-correctness issues of the strtod API.
*/
SERD_API
double
-serd_strtod(const char* str, char** endptr);
+serd_strtod(const char* str, size_t* end);
/**
Decode a base64 string.
diff --git a/src/reader.c b/src/reader.c
index 0eb06c88..37c4719c 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -79,7 +79,7 @@ Ref
push_node_padded(SerdReader* reader, size_t maxlen,
SerdType type, const char* str, size_t n_bytes)
{
- char* mem = (char*)serd_stack_push_aligned(
+ void* mem = serd_stack_push_aligned(
&reader->stack, sizeof(SerdNode) + maxlen + 1, sizeof(SerdNode));
SerdNode* const node = (SerdNode*)mem;
diff --git a/src/reader.h b/src/reader.h
index 6e1a24d7..f3ddde0a 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -68,7 +68,7 @@ static inline SerdStatus
push_byte(SerdReader* reader, Ref ref, const uint8_t c)
{
SERD_STACK_ASSERT_TOP(reader, ref);
- char* const s = serd_stack_push(&reader->stack, 1);
+ char* const s = (char*)serd_stack_push(&reader->stack, 1);
SerdNode* const node = (SerdNode*)(reader->stack.buf + ref);
++node->n_bytes;
*(s - 1) = c;
diff --git a/src/serd_internal.h b/src/serd_internal.h
index cccb321b..b4df45fb 100644
--- a/src/serd_internal.h
+++ b/src/serd_internal.h
@@ -195,7 +195,7 @@ serd_stack_free(SerdStack* stack)
stack->size = 0;
}
-static inline char*
+static inline void*
serd_stack_push(SerdStack* stack, size_t n_bytes)
{
const size_t new_size = stack->size + n_bytes;
diff --git a/src/string.c b/src/string.c
index a1d46507..01ed25a0 100644
--- a/src/string.c
+++ b/src/string.c
@@ -100,7 +100,7 @@ read_sign(const char** sptr)
}
double
-serd_strtod(const char* str, char** endptr)
+serd_strtod(const char* str, size_t* end)
{
double result = 0.0;
@@ -136,8 +136,8 @@ serd_strtod(const char* str, char** endptr)
result *= pow(10, expt * expt_sign);
}
- if (endptr) {
- *endptr = (char*)s;
+ if (end) {
+ *end = s - str;
}
return result * sign;
diff --git a/tests/serd_test.c b/tests/serd_test.c
index d41bbfc1..4a1c2485 100644
--- a/tests/serd_test.c
+++ b/tests/serd_test.c
@@ -39,11 +39,13 @@ test_strtod(double dbl, double max_delta)
char buf[1024];
snprintf(buf, sizeof(buf), "%f", dbl);
- char* endptr = NULL;
- const double out = serd_strtod(buf, &endptr);
+ size_t end = 0;
+ const double out = serd_strtod(buf, &end);
const double diff = fabs(out - dbl);
assert(diff <= max_delta);
+ assert(end == strlen(buf));
+
return 0;
}