Skip to content

variant: fix printing of referenced bytes #63

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

variant: fix printing of referenced bytes #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
932f17e
variant: fix size of bytes referenced when printed
edsiper Jun 5, 2025
17dd20b
tests: variants: test printing referenced bytes
edsiper Jun 5, 2025
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
2 changes: 1 addition & 1 deletion src/cfl_variant.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ int cfl_variant_print(FILE *fp, struct cfl_variant *val)
ret = fprintf(fp, "null");
break;
case CFL_VARIANT_BYTES:
size = cfl_sds_len(val->data.as_bytes);
size = val->size;
for (i=0; i<size; i++) {
ret = fprintf(fp, "%02x", (unsigned char)val->data.as_bytes[i]);
}
Expand Down
38 changes: 38 additions & 0 deletions tests/variant.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,43 @@ static void test_variant_print_bytes()
fclose(fp);
}

static void test_variant_print_bytes_referenced()
{
int ret;
char input[] = {0x1f, 0xaa, 0x0a, 0xff};
char *expect = "1faa0aff";

FILE *fp = NULL;
struct cfl_variant *val = NULL;

fp = tmpfile();
if (!TEST_CHECK(fp != NULL)) {
TEST_MSG("fp is NULL");
exit(1);
}

val = cfl_variant_create_from_bytes(input, 4, CFL_TRUE);
if (!TEST_CHECK(val != NULL)) {
TEST_MSG("cfl_variant_create_from_bytes failed");
fclose(fp);
exit(1);
}

ret = cfl_variant_print(fp, val);
if (!TEST_CHECK(ret > 0)) {
TEST_MSG("cfl_variant_print failed");
cfl_variant_destroy(val);
fclose(fp);
exit(1);
}
ret = compare(fp, expect, 0);
if (!TEST_CHECK(ret == 0)) {
TEST_MSG("compare failed");
}
cfl_variant_destroy(val);
fclose(fp);
}


static void test_variant_print_reference()
{
Expand Down Expand Up @@ -592,6 +629,7 @@ TEST_LIST = {
{"variant_print_string", test_variant_print_string},
{"variant_print_string_s", test_variant_print_string_s},
{"variant_print_bytes", test_variant_print_bytes},
{"variant_print_bytes_referenced", test_variant_print_bytes_referenced},
{"variant_print_array", test_variant_print_array},
{"variant_print_kvlist", test_variant_print_kvlist},
{"variant_print_reference", test_variant_print_reference},
Expand Down
Loading