aboutsummaryrefslogtreecommitdiffstats
path: root/src/reader.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/reader.c')
-rw-r--r--src/reader.c45
1 files changed, 22 insertions, 23 deletions
diff --git a/src/reader.c b/src/reader.c
index 0aa468a2..45f5f157 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -86,15 +86,15 @@ push_node_padded(SerdReader* const reader,
node->type = type;
node->buf = NULL;
- uint8_t* buf = (uint8_t*)(node + 1);
+ char* buf = (char*)(node + 1);
memcpy(buf, str, n_bytes + 1);
#ifdef SERD_STACK_CHECK
reader->allocs = (Ref*)realloc(reader->allocs,
sizeof(reader->allocs) * (++reader->n_allocs));
- reader->allocs[reader->n_allocs - 1] = ((uint8_t*)mem - reader->stack.buf);
+ reader->allocs[reader->n_allocs - 1] = ((char*)mem - reader->stack.buf);
#endif
- return (Ref)((uint8_t*)node - reader->stack.buf);
+ return (Ref)((char*)node - reader->stack.buf);
}
Ref
@@ -111,7 +111,7 @@ deref(SerdReader* const reader, const Ref ref)
{
if (ref) {
SerdNode* node = (SerdNode*)(reader->stack.buf + ref);
- node->buf = (uint8_t*)node + sizeof(SerdNode);
+ node->buf = (char*)node + sizeof(SerdNode);
return node;
}
return NULL;
@@ -127,8 +127,8 @@ pop_node(SerdReader* const reader, const Ref ref)
--reader->n_allocs;
#endif
SerdNode* const node = deref(reader, ref);
- uint8_t* const top = reader->stack.buf + reader->stack.size;
- serd_stack_pop_aligned(&reader->stack, (size_t)(top - (uint8_t*)node));
+ char* const top = reader->stack.buf + reader->stack.size;
+ serd_stack_pop_aligned(&reader->stack, (size_t)(top - (char*)node));
}
return 0;
}
@@ -241,17 +241,16 @@ serd_reader_get_handle(const SerdReader* const reader)
}
void
-serd_reader_add_blank_prefix(SerdReader* const reader,
- const uint8_t* const prefix)
+serd_reader_add_blank_prefix(SerdReader* const reader, const char* const prefix)
{
free(reader->bprefix);
reader->bprefix_len = 0;
reader->bprefix = NULL;
- const size_t prefix_len = prefix ? strlen((const char*)prefix) : 0;
+ const size_t prefix_len = prefix ? strlen(prefix) : 0;
if (prefix_len) {
reader->bprefix_len = prefix_len;
- reader->bprefix = (uint8_t*)malloc(reader->bprefix_len + 1);
+ reader->bprefix = (char*)malloc(reader->bprefix_len + 1);
memcpy(reader->bprefix, prefix, reader->bprefix_len + 1);
}
}
@@ -265,14 +264,14 @@ serd_reader_set_default_graph(SerdReader* const reader,
}
SerdStatus
-serd_reader_read_file(SerdReader* const reader, const uint8_t* const uri)
+serd_reader_read_file(SerdReader* const reader, const char* const uri)
{
- uint8_t* const path = serd_file_uri_parse(uri, NULL);
+ char* const path = serd_file_uri_parse(uri, NULL);
if (!path) {
return SERD_ERR_BAD_ARG;
}
- FILE* fd = serd_fopen((const char*)path, "rb");
+ FILE* fd = serd_fopen(path, "rb");
if (!fd) {
serd_free(path);
return SERD_ERR_UNKNOWN;
@@ -302,10 +301,10 @@ skip_bom(SerdReader* const me)
}
SerdStatus
-serd_reader_start_stream(SerdReader* const reader,
- FILE* const file,
- const uint8_t* const name,
- const bool bulk)
+serd_reader_start_stream(SerdReader* const reader,
+ FILE* const file,
+ const char* const name,
+ const bool bulk)
{
return serd_reader_start_source_stream(reader,
bulk ? (SerdSource)fread
@@ -321,7 +320,7 @@ serd_reader_start_source_stream(SerdReader* const reader,
const SerdSource read_func,
const SerdStreamErrorFunc error_func,
void* const stream,
- const uint8_t* const name,
+ const char* const name,
const size_t page_size)
{
return serd_byte_source_open_source(
@@ -369,9 +368,9 @@ serd_reader_end_stream(SerdReader* const reader)
}
SerdStatus
-serd_reader_read_file_handle(SerdReader* const reader,
- FILE* const file,
- const uint8_t* const name)
+serd_reader_read_file_handle(SerdReader* const reader,
+ FILE* const file,
+ const char* const name)
{
return serd_reader_read_source(reader,
(SerdSource)fread,
@@ -386,7 +385,7 @@ serd_reader_read_source(SerdReader* const reader,
const SerdSource source,
const SerdStreamErrorFunc error,
void* const stream,
- const uint8_t* const name,
+ const char* const name,
const size_t page_size)
{
SerdStatus st = serd_reader_start_source_stream(
@@ -406,7 +405,7 @@ serd_reader_read_source(SerdReader* const reader,
}
SerdStatus
-serd_reader_read_string(SerdReader* const reader, const uint8_t* const utf8)
+serd_reader_read_string(SerdReader* const reader, const char* const utf8)
{
serd_byte_source_open_string(&reader->source, utf8);