From 1483449efe47dccdfdf3f5415c2aa616f73c9cef Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 13 Nov 2020 11:22:18 +0100 Subject: Shorten node constructor names --- include/serd/serd.h | 44 ++++++++++++++++++++++---------------------- src/env.c | 6 +++--- src/node.c | 46 ++++++++++++++++++++++------------------------ src/serdi.c | 4 ++-- test/test_node.c | 6 +++--- test/test_uri.c | 22 ++++++++++------------ 6 files changed, 62 insertions(+), 66 deletions(-) diff --git a/include/serd/serd.h b/include/serd/serd.h index 6120df16..3c058b91 100644 --- a/include/serd/serd.h +++ b/include/serd/serd.h @@ -243,7 +243,7 @@ serd_strtod(const char* SERD_NONNULL str, Decode a base64 string. This function can be used to deserialise a blob node created with - serd_node_new_blob(). + serd_new_blob(). @param str Base64 string to decode. @param len The length of `str`. @@ -466,19 +466,19 @@ serd_node_from_substring(SerdNodeType type, const char* SERD_NULLABLE str, size_t len); -/// Simple wrapper for serd_node_new_uri() to resolve a URI node +/// Simple wrapper for serd_new_uri() to resolve a URI node SERD_API SerdNode -serd_node_new_uri_from_node(const SerdNode* SERD_NONNULL uri_node, - const SerdURIView* SERD_NULLABLE base, - SerdURIView* SERD_NULLABLE out); +serd_new_uri_from_node(const SerdNode* SERD_NONNULL uri_node, + const SerdURIView* SERD_NULLABLE base, + SerdURIView* SERD_NULLABLE out); -/// Simple wrapper for serd_node_new_uri() to resolve a URI string +/// Simple wrapper for serd_new_uri() to resolve a URI string SERD_API SerdNode -serd_node_new_uri_from_string(const char* SERD_NULLABLE str, - const SerdURIView* SERD_NULLABLE base, - SerdURIView* SERD_NULLABLE out); +serd_new_uri_from_string(const char* SERD_NULLABLE str, + const SerdURIView* SERD_NULLABLE base, + SerdURIView* SERD_NULLABLE out); /** Create a new file URI node from a file system path and optional hostname. @@ -491,9 +491,9 @@ serd_node_new_uri_from_string(const char* SERD_NULLABLE str, */ SERD_API SerdNode -serd_node_new_file_uri(const char* SERD_NONNULL path, - const char* SERD_NULLABLE hostname, - SerdURIView* SERD_NULLABLE out); +serd_new_file_uri(const char* SERD_NONNULL path, + const char* SERD_NULLABLE hostname, + SerdURIView* SERD_NULLABLE out); /** Create a new node by serialising `uri` into a new string. @@ -507,9 +507,9 @@ serd_node_new_file_uri(const char* SERD_NONNULL path, */ SERD_API SerdNode -serd_node_new_uri(const SerdURIView* SERD_NONNULL uri, - const SerdURIView* SERD_NULLABLE base, - SerdURIView* SERD_NULLABLE out); +serd_new_uri(const SerdURIView* SERD_NONNULL uri, + const SerdURIView* SERD_NULLABLE base, + SerdURIView* SERD_NULLABLE out); /** Create a new node by serialising `uri` into a new relative URI. @@ -525,10 +525,10 @@ serd_node_new_uri(const SerdURIView* SERD_NONNULL uri, */ SERD_API SerdNode -serd_node_new_relative_uri(const SerdURIView* SERD_NONNULL uri, - const SerdURIView* SERD_NULLABLE base, - const SerdURIView* SERD_NULLABLE root, - SerdURIView* SERD_NULLABLE out); +serd_new_relative_uri(const SerdURIView* SERD_NONNULL uri, + const SerdURIView* SERD_NULLABLE base, + const SerdURIView* SERD_NULLABLE root, + SerdURIView* SERD_NULLABLE out); /** Create a new node by serialising `d` into an xsd:decimal string. @@ -547,12 +547,12 @@ serd_node_new_relative_uri(const SerdURIView* SERD_NONNULL uri, */ SERD_API SerdNode -serd_node_new_decimal(double d, unsigned frac_digits); +serd_new_decimal(double d, unsigned frac_digits); /// Create a new node by serialising `i` into an xsd:integer string SERD_API SerdNode -serd_node_new_integer(int64_t i); +serd_new_integer(int64_t i); /** Create a node by serialising `buf` into an xsd:base64Binary string. @@ -566,7 +566,7 @@ serd_node_new_integer(int64_t i); */ SERD_API SerdNode -serd_node_new_blob(const void* SERD_NONNULL buf, size_t size, bool wrap_lines); +serd_new_blob(const void* SERD_NONNULL buf, size_t size, bool wrap_lines); /** Make a deep copy of `node`. diff --git a/src/env.c b/src/env.c index bc6a159f..4ca5bfe4 100644 --- a/src/env.c +++ b/src/env.c @@ -88,7 +88,7 @@ serd_env_set_base_uri(SerdEnv* const env, const SerdNode* const uri) // Resolve base URI and create a new node and URI for it SerdURIView base_uri; SerdNode base_uri_node = - serd_node_new_uri_from_node(uri, &env->base_uri, &base_uri); + serd_new_uri_from_node(uri, &env->base_uri, &base_uri); // Replace the current base URI serd_node_free(&env->base_uri_node); @@ -151,7 +151,7 @@ serd_env_set_prefix(SerdEnv* const env, // Resolve relative URI and create a new node and URI for it SerdURIView abs_uri; SerdNode abs_uri_node = - serd_node_new_uri_from_node(uri, &env->base_uri, &abs_uri); + serd_new_uri_from_node(uri, &env->base_uri, &abs_uri); // Set prefix to resolved (absolute) URI serd_env_add(env, name, &abs_uri_node); @@ -237,7 +237,7 @@ serd_env_expand_node(const SerdEnv* const env, const SerdNode* const node) break; case SERD_URI: { SerdURIView ignored; - return serd_node_new_uri_from_node(node, &env->base_uri, &ignored); + return serd_new_uri_from_node(node, &env->base_uri, &ignored); } case SERD_CURIE: { SerdStringView prefix; diff --git a/src/node.c b/src/node.c index 337507a9..93c2214a 100644 --- a/src/node.c +++ b/src/node.c @@ -117,28 +117,28 @@ serd_node_equals(const SerdNode* const a, const SerdNode* const b) } SerdNode -serd_node_new_uri_from_node(const SerdNode* const uri_node, - const SerdURIView* const base, - SerdURIView* const out) +serd_new_uri_from_node(const SerdNode* const uri_node, + const SerdURIView* const base, + SerdURIView* const out) { return (uri_node->type == SERD_URI && uri_node->buf) - ? serd_node_new_uri_from_string(uri_node->buf, base, out) + ? serd_new_uri_from_string(uri_node->buf, base, out) : SERD_NODE_NULL; } SerdNode -serd_node_new_uri_from_string(const char* const str, - const SerdURIView* const base, - SerdURIView* const out) +serd_new_uri_from_string(const char* const str, + const SerdURIView* const base, + SerdURIView* const out) { if (!str || str[0] == '\0') { // Empty URI => Base URI, or nothing if no base is given - return base ? serd_node_new_uri(base, NULL, out) : SERD_NODE_NULL; + return base ? serd_new_uri(base, NULL, out) : SERD_NODE_NULL; } SerdURIView uri; serd_uri_parse(str, &uri); - return serd_node_new_uri(&uri, base, out); // Resolve/Serialise + return serd_new_uri(&uri, base, out); // Resolve/Serialise } static bool @@ -178,9 +178,9 @@ is_uri_path_char(const char c) } SerdNode -serd_node_new_file_uri(const char* const path, - const char* const hostname, - SerdURIView* const out) +serd_new_file_uri(const char* const path, + const char* const hostname, + SerdURIView* const out) { const size_t path_len = strlen(path); const size_t hostname_len = hostname ? strlen(hostname) : 0; @@ -228,9 +228,9 @@ serd_node_new_file_uri(const char* const path, } SerdNode -serd_node_new_uri(const SerdURIView* const uri, - const SerdURIView* const base, - SerdURIView* const out) +serd_new_uri(const SerdURIView* const uri, + const SerdURIView* const base, + SerdURIView* const out) { SerdURIView abs_uri = *uri; if (base) { @@ -254,10 +254,10 @@ serd_node_new_uri(const SerdURIView* const uri, } SerdNode -serd_node_new_relative_uri(const SerdURIView* const uri, - const SerdURIView* const base, - const SerdURIView* const root, - SerdURIView* const out) +serd_new_relative_uri(const SerdURIView* const uri, + const SerdURIView* const base, + const SerdURIView* const root, + SerdURIView* const out) { const size_t uri_len = serd_uri_string_length(uri); const size_t base_len = serd_uri_string_length(base); @@ -285,7 +285,7 @@ serd_digits(const double abs) } SerdNode -serd_node_new_decimal(const double d, const unsigned frac_digits) +serd_new_decimal(const double d, const unsigned frac_digits) { if (isnan(d) || isinf(d)) { return SERD_NODE_NULL; @@ -340,7 +340,7 @@ serd_node_new_decimal(const double d, const unsigned frac_digits) } SerdNode -serd_node_new_integer(const int64_t i) +serd_new_integer(const int64_t i) { uint64_t abs_i = (i < 0) ? -i : i; const unsigned digits = serd_digits((double)abs_i); @@ -365,9 +365,7 @@ serd_node_new_integer(const int64_t i) } SerdNode -serd_node_new_blob(const void* const buf, - const size_t size, - const bool wrap_lines) +serd_new_blob(const void* const buf, const size_t size, const bool wrap_lines) { const size_t len = serd_base64_get_length(size, wrap_lines); uint8_t* str = (uint8_t*)calloc(len + 2, 1); diff --git a/src/serdi.c b/src/serdi.c index f713f327..c447e2b2 100644 --- a/src/serdi.c +++ b/src/serdi.c @@ -318,9 +318,9 @@ main(int argc, char** argv) SerdURIView base_uri = SERD_URI_NULL; SerdNode base = SERD_NODE_NULL; if (a < argc) { // Base URI given on command line - base = serd_node_new_uri_from_string((const char*)argv[a], NULL, &base_uri); + base = serd_new_uri_from_string((const char*)argv[a], NULL, &base_uri); } else if (from_file && in_fd != stdin) { // Use input file URI - base = serd_node_new_file_uri(input, NULL, &base_uri); + base = serd_new_file_uri(input, NULL, &base_uri); } FILE* const out_fd = stdout; diff --git a/test/test_node.c b/test/test_node.c index ac0a02ae..52a98740 100644 --- a/test/test_node.c +++ b/test/test_node.c @@ -91,7 +91,7 @@ test_double_to_node(void) NULL}; for (size_t i = 0; i < sizeof(dbl_test_nums) / sizeof(double); ++i) { - SerdNode node = serd_node_new_decimal(dbl_test_nums[i], 8); + SerdNode node = serd_new_decimal(dbl_test_nums[i], 8); const bool pass = (node.buf && dbl_test_strs[i]) ? !strcmp(node.buf, dbl_test_strs[i]) : (node.buf == dbl_test_strs[i]); @@ -111,7 +111,7 @@ test_integer_to_node(void) "0", "0", "-23", "23", "-12340", "1000", "-1000"}; for (size_t i = 0; i < sizeof(int_test_nums) / sizeof(double); ++i) { - SerdNode node = serd_node_new_integer(int_test_nums[i]); + SerdNode node = serd_new_integer(int_test_nums[i]); assert(!strcmp(node.buf, int_test_strs[i])); assert(node.n_bytes == strlen(node.buf)); serd_node_free(&node); @@ -127,7 +127,7 @@ test_blob_to_node(void) data[i] = (uint8_t)((size + i) % 256); } - SerdNode blob = serd_node_new_blob(data, size, size % 5); + SerdNode blob = serd_new_blob(data, size, size % 5); assert(blob.n_bytes == strlen(blob.buf)); diff --git a/test/test_uri.c b/test/test_uri.c index e6933759..8f3b559b 100644 --- a/test/test_uri.c +++ b/test/test_uri.c @@ -32,7 +32,7 @@ test_file_uri(const char* hostname, expected_path = path; } - SerdNode node = serd_node_new_file_uri(path, hostname, 0); + SerdNode node = serd_new_file_uri(path, hostname, 0); char* out_hostname = NULL; char* out_path = serd_file_uri_parse(node.buf, &out_hostname); assert(!strcmp(node.buf, expected_uri)); @@ -66,14 +66,14 @@ test_uri_parsing(void) static void test_uri_from_string(void) { - SerdNode nonsense = serd_node_new_uri_from_string(NULL, NULL, NULL); + SerdNode nonsense = serd_new_uri_from_string(NULL, NULL, NULL); assert(nonsense.type == SERD_NOTHING); SerdURIView base_uri; SerdNode base = - serd_node_new_uri_from_string("http://example.org/", NULL, &base_uri); - SerdNode nil = serd_node_new_uri_from_string(NULL, &base_uri, NULL); - SerdNode nil2 = serd_node_new_uri_from_string("", &base_uri, NULL); + serd_new_uri_from_string("http://example.org/", NULL, &base_uri); + SerdNode nil = serd_new_uri_from_string(NULL, &base_uri, NULL); + SerdNode nil2 = serd_new_uri_from_string("", &base_uri, NULL); assert(nil.type == SERD_URI); assert(!strcmp(nil.buf, base.buf)); assert(nil2.type == SERD_URI); @@ -89,29 +89,27 @@ test_relative_uri(void) { SerdURIView base_uri; SerdNode base = - serd_node_new_uri_from_string("http://example.org/", NULL, &base_uri); + serd_new_uri_from_string("http://example.org/", NULL, &base_uri); SerdNode abs = serd_node_from_string(SERD_URI, "http://example.org/foo/bar"); SerdURIView abs_uri; serd_uri_parse(abs.buf, &abs_uri); SerdURIView rel_uri; - SerdNode rel = - serd_node_new_relative_uri(&abs_uri, &base_uri, NULL, &rel_uri); + SerdNode rel = serd_new_relative_uri(&abs_uri, &base_uri, NULL, &rel_uri); assert(!strcmp(rel.buf, "/foo/bar")); - SerdNode up = serd_node_new_relative_uri(&base_uri, &abs_uri, NULL, NULL); + SerdNode up = serd_new_relative_uri(&base_uri, &abs_uri, NULL, NULL); assert(!strcmp(up.buf, "../")); - SerdNode noup = - serd_node_new_relative_uri(&base_uri, &abs_uri, &abs_uri, NULL); + SerdNode noup = serd_new_relative_uri(&base_uri, &abs_uri, &abs_uri, NULL); assert(!strcmp(noup.buf, "http://example.org/")); SerdNode x = serd_node_from_string(SERD_URI, "http://example.org/foo/x"); SerdURIView x_uri; serd_uri_parse(x.buf, &x_uri); - SerdNode x_rel = serd_node_new_relative_uri(&x_uri, &abs_uri, &abs_uri, NULL); + SerdNode x_rel = serd_new_relative_uri(&x_uri, &abs_uri, &abs_uri, NULL); assert(!strcmp(x_rel.buf, "x")); serd_node_free(&x_rel); -- cgit v1.2.1