From cb3e77586ac835c156cb4700b324dafbbb110adf Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Wed, 22 Oct 2025 14:59:18 -0400 Subject: pkstr: clone functions if PK_IMPL_MEM defined --- pkstr.h | 26 ++++++++++++++++++++++++++ test/pkstr.c | 29 +++++++++++++++++++++++++++++ test/pkstr.cpp | 1 + 3 files changed, 56 insertions(+) diff --git a/pkstr.h b/pkstr.h index 3ba0630..f4814eb 100644 --- a/pkstr.h +++ b/pkstr.h @@ -1,6 +1,8 @@ #ifndef PK_STR_H #define PK_STR_H +#include "pkmem.h" /* deleteme */ + #include struct pk_str { @@ -18,6 +20,8 @@ struct pk_str cstring_to_pk_str(char *s); struct pk_cstr cstring_to_pk_cstr(const char *s); struct pk_str pk_cstr_to_pk_str(const struct pk_cstr *s); struct pk_cstr pk_str_to_pk_cstr(const struct pk_str *s); +struct pk_str pk_str_clone(const struct pk_str *s, struct pk_membucket *bkt); +struct pk_cstr pk_cstr_clone(const struct pk_cstr *s, struct pk_membucket *bkt); int pk_compare_str(const struct pk_str *lhs, const struct pk_str *rhs); int pk_compare_cstr(const struct pk_cstr *lhs, const struct pk_cstr *rhs); @@ -68,6 +72,28 @@ pk_str_to_pk_cstr(const struct pk_str *s) return ret; } +struct pk_str +pk_str_clone(const struct pk_str *s, struct pk_membucket *bkt) { + struct pk_str str; + str.length = s->length == 0 ? strlen(s->val) : s->length; + str.reserved = s->length + 1; + char *ss = (char*)pk_new(str.reserved * sizeof(char), alignof(char), bkt); + strncpy(ss, s->val, str.reserved); + str.val = ss; + return str; +} + +struct pk_cstr +pk_cstr_clone(const struct pk_cstr *s, struct pk_membucket *bkt) { + struct pk_cstr str; + str.length = s->length == 0 ? strlen(s->val) : s->length; + str.reserved = s->length + 1; + char *ss = (char*)pk_new(str.reserved * sizeof(char), alignof(char), bkt); + strncpy(ss, s->val, str.reserved); + str.val = ss; + return str; +} + int pk_compare_str(const struct pk_str *lhs, const struct pk_str *rhs) { diff --git a/test/pkstr.c b/test/pkstr.c index f477e6a..8e7193b 100644 --- a/test/pkstr.c +++ b/test/pkstr.c @@ -1,4 +1,5 @@ +#define PK_IMPL_MEM #define PK_IMPL_STR #include "../pkstr.h" @@ -18,6 +19,9 @@ int main(int argc, char *argv[]) struct pk_str os; struct pk_cstr ocs; + struct pk_membucket *bkt = pk_mem_bucket_create("test-pkstr", PK_MEM_DEFAULT_BUCKET_SIZE, PK_MEMBUCKET_FLAG_NONE); + pk_mem_bucket_set_client_mem_bucket(bkt); + // cstring_to_pk_str { s = cstring_to_pk_str("this is a test"); @@ -54,5 +58,30 @@ int main(int argc, char *argv[]) PK_LOGV_INF("pk_compare_cstr, ('%s' cmp '%s') = '%i'\n", ocs.val, cs.val, pk_compare_cstr(&ocs, &cs)); } + // pk_clone_pk_str + { + s = cstring_to_pk_str("this is a clone test"); + os = pk_str_clone(&s, nullptr); + if (s.length != os.length) return 1; + if (os.reserved == 0) return 1; + if (s.val == os.val) return 1; + if (os.val == nullptr) return 1; + PK_LOGV_INF("pk_clone_pk_str, ('%s' to '%s')\n", s.val, os.val); + } + + // pk_clone_pk_cstr + { + cs = cstring_to_pk_cstr("this is a const clone test"); + ocs = pk_cstr_clone(&cs, nullptr); + if (cs.length != ocs.length) return 1; + if (ocs.reserved == 0) return 1; + if (cs.val == ocs.val) return 1; + if (ocs.val == nullptr) return 1; + PK_LOGV_INF("pk_clone_pk_cstr, ('%s' to '%s')\n", cs.val, ocs.val); + } + + pk_mem_bucket_destroy(bkt); + bkt = nullptr; + return 0; } diff --git a/test/pkstr.cpp b/test/pkstr.cpp index c7b55bc..04a61da 100644 --- a/test/pkstr.cpp +++ b/test/pkstr.cpp @@ -1,4 +1,5 @@ +#define PK_IMPL_MEM #define PK_IMPL_STR #include "../pkstr.h" -- cgit v1.2.3