Skip to content

Improved c89 compatibility #68

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

Closed
wants to merge 1 commit into from
Closed

Improved c89 compatibility #68

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
6 changes: 4 additions & 2 deletions src/mpack/mpack-common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,8 @@ static void mpack_tag_debug_complete_bin_ext(mpack_tag_t tag, size_t string_leng
buffer_size -= 2;

size_t hex_bytes = 0;
for (size_t i = 0; i < MPACK_PRINT_BYTE_COUNT && i < prefix_size && buffer_size > 2; ++i) {
size_t i;
for (i = 0; i < MPACK_PRINT_BYTE_COUNT && i < prefix_size && buffer_size > 2; ++i) {
uint8_t byte = (uint8_t)prefix[i];
buffer[0] = mpack_hex_char((uint8_t)(byte >> 4));
buffer[1] = mpack_hex_char((uint8_t)(byte & 0xfu));
Expand Down Expand Up @@ -620,7 +621,8 @@ bool mpack_utf8_check_no_null(const char* str, size_t bytes) {
}

bool mpack_str_check_no_null(const char* str, size_t bytes) {
for (size_t i = 0; i < bytes; ++i)
size_t i;
for (i = 0; i < bytes; ++i)
if (str[i] == '\0')
return false;
return true;
Expand Down
6 changes: 4 additions & 2 deletions src/mpack/mpack-expect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,8 @@ size_t mpack_expect_enum(mpack_reader_t* reader, const char* strings[], size_t c
return count;

// find what key it matches
for (size_t i = 0; i < count; ++i) {
size_t i;
for (i = 0; i < count; ++i) {
const char* other = strings[i];
size_t otherlen = mpack_strlen(other);
if (keylen == otherlen && mpack_memcmp(key, other, keylen) == 0)
Expand Down Expand Up @@ -748,7 +749,8 @@ size_t mpack_expect_enum_optional(mpack_reader_t* reader, const char* strings[],
return count;

// find what key it matches
for (size_t i = 0; i < count; ++i) {
size_t i;
for (i = 0; i < count; ++i) {
const char* other = strings[i];
size_t otherlen = mpack_strlen(other);
if (keylen == otherlen && mpack_memcmp(key, other, keylen) == 0)
Expand Down
30 changes: 18 additions & 12 deletions src/mpack/mpack-node.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1280,12 +1280,13 @@ mpack_tag_t mpack_node_tag(mpack_node_t node) {
#if MPACK_DEBUG && MPACK_STDIO
static void mpack_node_print_element(mpack_node_t node, mpack_print_t* print, size_t depth) {
mpack_node_data_t* data = node.data;
size_t i,j;
switch (data->type) {
case mpack_type_str:
{
mpack_print_append_cstr(print, "\"");
const char* bytes = mpack_node_data_unchecked(node);
for (size_t i = 0; i < data->len; ++i) {
for (i = 0; i < data->len; ++i) {
char c = bytes[i];
switch (c) {
case '\n': mpack_print_append_cstr(print, "\\n"); break;
Expand All @@ -1300,23 +1301,23 @@ static void mpack_node_print_element(mpack_node_t node, mpack_print_t* print, si

case mpack_type_array:
mpack_print_append_cstr(print, "[\n");
for (size_t i = 0; i < data->len; ++i) {
for (size_t j = 0; j < depth + 1; ++j)
for (i = 0; i < data->len; ++i) {
for (j = 0; j < depth + 1; ++j)
mpack_print_append_cstr(print, " ");
mpack_node_print_element(mpack_node_array_at(node, i), print, depth + 1);
if (i != data->len - 1)
mpack_print_append_cstr(print, ",");
mpack_print_append_cstr(print, "\n");
}
for (size_t i = 0; i < depth; ++i)
for (i = 0; i < depth; ++i)
mpack_print_append_cstr(print, " ");
mpack_print_append_cstr(print, "]");
break;

case mpack_type_map:
mpack_print_append_cstr(print, "{\n");
for (size_t i = 0; i < data->len; ++i) {
for (size_t j = 0; j < depth + 1; ++j)
for (i = 0; i < data->len; ++i) {
for (j = 0; j < depth + 1; ++j)
mpack_print_append_cstr(print, " ");
mpack_node_print_element(mpack_node_map_key_at(node, i), print, depth + 1);
mpack_print_append_cstr(print, ": ");
Expand All @@ -1325,7 +1326,7 @@ static void mpack_node_print_element(mpack_node_t node, mpack_print_t* print, si
mpack_print_append_cstr(print, ",");
mpack_print_append_cstr(print, "\n");
}
for (size_t i = 0; i < depth; ++i)
for (i = 0; i < depth; ++i)
mpack_print_append_cstr(print, " ");
mpack_print_append_cstr(print, "}");
break;
Expand Down Expand Up @@ -1395,7 +1396,8 @@ void mpack_node_print_to_file(mpack_node_t node, FILE* file) {
print.context = file;

size_t depth = 2;
for (size_t i = 0; i < depth; ++i)
size_t i;
for (i = 0; i < depth; ++i)
mpack_print_append_cstr(&print, " ");
mpack_node_print_element(node, &print, depth);
mpack_print_append_cstr(&print, "\n");
Expand Down Expand Up @@ -1726,7 +1728,8 @@ static mpack_node_data_t* mpack_node_map_int_impl(mpack_node_t node, int64_t num

mpack_node_data_t* found = NULL;

for (size_t i = 0; i < node.data->len; ++i) {
size_t i;
for (i = 0; i < node.data->len; ++i) {
mpack_node_data_t* key = mpack_node_child(node, i * 2);

if ((key->type == mpack_type_int && key->value.i == num) ||
Expand Down Expand Up @@ -1757,7 +1760,8 @@ static mpack_node_data_t* mpack_node_map_uint_impl(mpack_node_t node, uint64_t n

mpack_node_data_t* found = NULL;

for (size_t i = 0; i < node.data->len; ++i) {
size_t i;
for (i = 0; i < node.data->len; ++i) {
mpack_node_data_t* key = mpack_node_child(node, i * 2);

if ((key->type == mpack_type_uint && key->value.u == num) ||
Expand Down Expand Up @@ -1791,7 +1795,8 @@ static mpack_node_data_t* mpack_node_map_str_impl(mpack_node_t node, const char*
mpack_tree_t* tree = node.tree;
mpack_node_data_t* found = NULL;

for (size_t i = 0; i < node.data->len; ++i) {
size_t i;
for (i = 0; i < node.data->len; ++i) {
mpack_node_data_t* key = mpack_node_child(node, i * 2);

if (key->type == mpack_type_str && key->len == length &&
Expand Down Expand Up @@ -1893,7 +1898,8 @@ size_t mpack_node_enum_optional(mpack_node_t node, const char* strings[], size_t
mpack_assert(mpack_node_error(node) == mpack_ok, "these should not fail");

// find what key it matches
for (size_t i = 0; i < count; ++i) {
size_t i;
for (i = 0; i < count; ++i) {
const char* other = strings[i];
size_t otherlen = mpack_strlen(other);
if (keylen == otherlen && mpack_memcmp(key, other, keylen) == 0)
Expand Down