From a29581d3ba664175c459e20e6c86be09707fde6e Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 16 Mar 2016 16:21:20 -0400 Subject: Use char* for strings in public API The constant casting just makes user code a mess, for no benefit. --- src/string.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'src/string.c') diff --git a/src/string.c b/src/string.c index defbaac4..f232acfa 100644 --- a/src/string.c +++ b/src/string.c @@ -20,7 +20,6 @@ #include #include -#include #include #include @@ -30,36 +29,36 @@ serd_free(void* ptr) free(ptr); } -const uint8_t* +const char* serd_strerror(SerdStatus status) { switch (status) { case SERD_SUCCESS: - return (const uint8_t*)"Success"; + return "Success"; case SERD_FAILURE: - return (const uint8_t*)"Non-fatal failure"; + return "Non-fatal failure"; case SERD_ERR_UNKNOWN: - return (const uint8_t*)"Unknown error"; + return "Unknown error"; case SERD_ERR_BAD_SYNTAX: - return (const uint8_t*)"Invalid syntax"; + return "Invalid syntax"; case SERD_ERR_BAD_ARG: - return (const uint8_t*)"Invalid argument"; + return "Invalid argument"; case SERD_ERR_NOT_FOUND: - return (const uint8_t*)"Not found"; + return "Not found"; case SERD_ERR_ID_CLASH: - return (const uint8_t*)"Blank node ID clash"; + return "Blank node ID clash"; case SERD_ERR_BAD_CURIE: - return (const uint8_t*)"Invalid CURIE"; + return "Invalid CURIE"; case SERD_ERR_INTERNAL: - return (const uint8_t*)"Internal error"; + return "Internal error"; default: break; } - return (const uint8_t*)"Unknown error"; // never reached + return "Unknown error"; // never reached } static inline void -serd_update_flags(const uint8_t c, SerdNodeFlags* const flags) +serd_update_flags(const char c, SerdNodeFlags* const flags) { switch (c) { case '\r': @@ -74,7 +73,7 @@ serd_update_flags(const uint8_t c, SerdNodeFlags* const flags) } size_t -serd_substrlen(const uint8_t* const str, +serd_substrlen(const char* const str, const size_t len, SerdNodeFlags* const flags) { @@ -90,7 +89,7 @@ serd_substrlen(const uint8_t* const str, } size_t -serd_strlen(const uint8_t* str, SerdNodeFlags* flags) +serd_strlen(const char* str, SerdNodeFlags* flags) { if (flags) { size_t i = 0; @@ -101,7 +100,7 @@ serd_strlen(const uint8_t* str, SerdNodeFlags* flags) return i; } - return strlen((const char*)str); + return strlen(str); } static inline double -- cgit v1.2.1