From 07c3c06f59348c5558c909b2aa10734bf95e62e7 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 7 Jul 2016 23:50:39 -0400
Subject: 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.
---
 src/reader.c        | 2 +-
 src/reader.h        | 2 +-
 src/serd_internal.h | 2 +-
 src/string.c        | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

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 c51b88ed..62c0a72c 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;
-- 
cgit v1.2.1