Skip to content

Preserve 32-bit width when writing negative binary integers #304

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
fhgffy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preserve 32-bit width when writing negative binary integers #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 lib/libconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ static void __config_write_value(const config_t *config,
case CONFIG_FORMAT_BIN:
{
/* Once %b/%B become more widely supported, could feature test for them */
char *str = libconfig_format_bin(value->ival, value_buf);
char *str = libconfig_format_bin((uint32_t)value->ival, value_buf);
fprintf(stream, "0b%s", str);
break;
}
Expand Down
69 changes: 69 additions & 0 deletions tests/tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,74 @@ TT_TEST(BinaryAndHex)

/* ------------------------------------------------------------------------- */

TT_TEST(BinaryIntegerRoundTrip)
{
static const struct
{
int value;
const char *text;
} cases[] = {
{ (-2147483647 - 1), "v = 0b10000000000000000000000000000000;\n" },
{ -2147483647, "v = 0b10000000000000000000000000000001;\n" },
{ -2, "v = 0b11111111111111111111111111111110;\n" },
{ -1, "v = 0b11111111111111111111111111111111;\n" },
{ 0, "v = 0b0;\n" },
{ 1, "v = 0b1;\n" },
{ 2147483647, "v = 0b1111111111111111111111111111111;\n" }
};
unsigned int i;
int use_default;

for(use_default = 0; use_default < 2; ++use_default)
{
for(i = 0; i < sizeof(cases) / sizeof(cases[0]); ++i)
{
config_t cfg, restored;
config_setting_t *setting;
FILE *stream = tmpfile();
char text[128];
int ok;

TT_ASSERT_TRUE(stream != NULL);
if(!stream)
continue;

config_init(&cfg);
config_init(&restored);
setting = config_setting_add(config_root_setting(&cfg), "v",
CONFIG_TYPE_INT);
TT_ASSERT_TRUE(config_setting_set_int(setting, cases[i].value));
if(use_default)
config_set_default_format(&cfg, CONFIG_FORMAT_BIN);
else
TT_ASSERT_TRUE(config_setting_set_format(setting, CONFIG_FORMAT_BIN));

config_write(&cfg, stream);
rewind(stream);
TT_ASSERT_TRUE(fgets(text, sizeof(text), stream) != NULL);
TT_ASSERT_STR_EQ(text, cases[i].text);
TT_ASSERT_INT_EQ(fgetc(stream), EOF);

rewind(stream);
ok = config_read(&restored, stream);
TT_ASSERT_TRUE(ok);
if(ok)
{
setting = config_lookup(&restored, "v");
TT_ASSERT_INT_EQ(config_setting_type(setting), CONFIG_TYPE_INT);
TT_ASSERT_INT_EQ(config_setting_get_int(setting), cases[i].value);
TT_ASSERT_INT_EQ(config_setting_get_format(setting), CONFIG_FORMAT_BIN);
}

fclose(stream);
config_destroy(&restored);
config_destroy(&cfg);
}
}
}

/* ------------------------------------------------------------------------- */

int main(int argc, char **argv)
{
int failures;
Expand All @@ -782,6 +850,7 @@ int main(int argc, char **argv)
TT_SUITE_TEST(LibConfigTests, IncludeReadError);
TT_SUITE_TEST(LibConfigTests, ReadStream);
TT_SUITE_TEST(LibConfigTests, BinaryAndHex);
TT_SUITE_TEST(LibConfigTests, BinaryIntegerRoundTrip);
TT_SUITE_RUN(LibConfigTests);
failures = TT_SUITE_NUM_FAILURES(LibConfigTests);
TT_SUITE_END(LibConfigTests);
Expand Down