Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fmt/pl: add pl_alloc_str #983

Merged
merged 1 commit into from
Oct 18, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/re_fmt.h
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@ struct pl {

extern const struct pl pl_null;

struct pl *pl_alloc_str(const char *str);
void pl_set_str(struct pl *pl, const char *str);
void pl_set_mbuf(struct pl *pl, const struct mbuf *mb);
int32_t pl_i32(const struct pl *pl);
42 changes: 42 additions & 0 deletions src/fmt/pl.c
Original file line number Diff line number Diff line change
@@ -21,6 +21,48 @@
const struct pl pl_null = {NULL, 0};


static void pl_alloc_destruct(void *arg)
{
struct pl *pl = arg;

mem_deref((void *)pl->p);
}


/**
* Allocate a pointer-length object from a NULL-terminated string
*
* @param str NULL-terminated string
*
* @return Allocated Pointer-length object or NULL
*/
struct pl *pl_alloc_str(const char *str)
{
struct pl *pl;

if (!str)
return NULL;

size_t sz = strlen(str);

pl = mem_zalloc(sizeof(struct pl), pl_alloc_destruct);
if (!pl)
return NULL;

pl->p = mem_alloc(sz, NULL);
if (!pl->p) {
mem_deref(pl);
return NULL;
}

memcpy((void *)pl->p, str, sz);

pl->l = sz;

return pl;
}


/**
* Initialise a pointer-length object from a NULL-terminated string
*
18 changes: 18 additions & 0 deletions test/fmt.c
Original file line number Diff line number Diff line change
@@ -138,6 +138,24 @@ int test_fmt_pl(void)
}


int test_fmt_pl_alloc_str(void)
{
int err = 0;
char test_str[] = "Test String";

struct pl *pl = pl_alloc_str(test_str);
if (!pl)
return ENOMEM;

TEST_MEMCMP(test_str, str_len(test_str), pl->p, pl->l);

out:
mem_deref(pl);

return err;
}


int test_fmt_pl_i32(void)
{
const struct {
1 change: 1 addition & 0 deletions test/test.c
Original file line number Diff line number Diff line change
@@ -79,6 +79,7 @@ static const struct test tests[] = {
TEST(test_fmt_human_time),
TEST(test_fmt_param),
TEST(test_fmt_pl),
TEST(test_fmt_pl_alloc_str),
TEST(test_fmt_pl_float),
TEST(test_fmt_pl_i32),
TEST(test_fmt_pl_i64),
1 change: 1 addition & 0 deletions test/test.h
Original file line number Diff line number Diff line change
@@ -181,6 +181,7 @@ int test_fmt_hexdump(void);
int test_fmt_human_time(void);
int test_fmt_param(void);
int test_fmt_pl(void);
int test_fmt_pl_alloc_str(void);
int test_fmt_pl_float(void);
int test_fmt_pl_i32(void);
int test_fmt_pl_i64(void);