Skip to content

Commit

Permalink
fix some printf format
Browse files Browse the repository at this point in the history
  • Loading branch information
sinkinben committed Oct 22, 2021
1 parent 37fedcd commit 706cf01
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion common.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void print_prompt()

void read_input(buffer_t *input)
{
size_t bytes_read = getline(&(input->buffer), &(input->buffer_length), stdin);
ssize_t bytes_read = getline(&(input->buffer), &(input->buffer_length), stdin);

if (bytes_read <= 0)
{
Expand Down
44 changes: 22 additions & 22 deletions debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,34 @@ void print_max_cells()
}
void print_constants()
{
printf("table row size: %d\n", ROW_SIZE);
printf("table row size: %u\n", ROW_SIZE);
printf(" - id: %u\n", ID_SIZE);
printf(" - username: %u\n", USERNAME_SIZE);
printf(" - email: %u\n", EMAIL_SIZE);

printf("common node header size: %d\n", COMMON_NODE_HEADER_SIZE);
printf(" - node_type: %d\n", NODE_TYPE_SIZE);
printf(" - is_root: %d\n", IS_ROOT_SIZE);
printf(" - parent: %d\n", PARENT_POINTER_SIZE);
printf(" - node_type: %u\n", NODE_TYPE_SIZE);
printf(" - is_root: %u\n", IS_ROOT_SIZE);
printf(" - parent: %u\n", PARENT_POINTER_SIZE);

printf("leaf node:\n");
printf(" + header size: %d\n", LEAF_NODE_HEADER_SIZE);
printf(" - num_cells: %d\n", LEAF_NODE_NUM_CELLS_SIZE);
printf(" - next_leaf: %d\n", LEAF_NODE_NEXT_LEAF_SIZE);
printf(" + cell size: %d\n", LEAF_NODE_CELL_SIZE);
printf(" - key size: %d\n", LEAF_NODE_KEY_SIZE);
printf(" - row size: %d\n", LEAF_NODE_VALUE_SIZE);
printf(" + spaces for cells: %d\n", LEAF_NODE_SPACE_FOR_CELLS);
printf(" + header size: %u\n", LEAF_NODE_HEADER_SIZE);
printf(" - num_cells: %u\n", LEAF_NODE_NUM_CELLS_SIZE);
printf(" - next_leaf: %u\n", LEAF_NODE_NEXT_LEAF_SIZE);
printf(" + cell size: %u\n", LEAF_NODE_CELL_SIZE);
printf(" - key size: %u\n", LEAF_NODE_KEY_SIZE);
printf(" - row size: %u\n", LEAF_NODE_VALUE_SIZE);
printf(" + spaces for cells: %u\n", LEAF_NODE_SPACE_FOR_CELLS);
// printf(" + max cells: %d\n", LEAF_NODE_MAX_CELLS);

printf("internal node:\n");
printf(" + header size: %d\n", INTERNAL_NODE_HEADER_SIZE);
printf(" - num_cells: %d\n", INTERNAL_NODE_NUM_KEYS_SIZE);
printf(" - right_child: %d\n", INTERNAL_NODE_RIGHT_CHILD_SIZE);
printf(" + cell size: %d\n", INTERNAL_NODE_CELL_SIZE);
printf(" - child: %d\n", INTERNAL_NODE_CHILD_SIZE);
printf(" - key: %d\n", INTERNAL_NODE_KEY_SIZE);
printf(" + spaces for cells: %d\n", INTERNAL_NODE_SPACE_FOR_CELLS);
printf(" + header size: %u\n", INTERNAL_NODE_HEADER_SIZE);
printf(" - num_cells: %u\n", INTERNAL_NODE_NUM_KEYS_SIZE);
printf(" - right_child: %u\n", INTERNAL_NODE_RIGHT_CHILD_SIZE);
printf(" + cell size: %u\n", INTERNAL_NODE_CELL_SIZE);
printf(" - child: %u\n", INTERNAL_NODE_CHILD_SIZE);
printf(" - key: %u\n", INTERNAL_NODE_KEY_SIZE);
printf(" + spaces for cells: %u\n", INTERNAL_NODE_SPACE_FOR_CELLS);
// printf(" + max cells: %d\n", INTERNAL_NODE_MAX_CELLS);
}

Expand All @@ -57,15 +57,15 @@ void print_btree(pager_t *pager, uint32_t page_num, uint32_t indent_level)
{
num_keys = *internal_node_num_keys(node);
indent(indent_level);
printf("- internal (size %d, page %d, parent %d)\n", num_keys, page_num, *node_parent(node));
printf("- internal (size %u, page %u, parent %u)\n", num_keys, page_num, *node_parent(node));
// printf("- internal (size %d)\n", num_keys);
for (uint32_t i = 0; i < num_keys; i++)
{
child = *internal_node_child(node, i);
print_btree(pager, child, indent_level + 1);

indent(indent_level + 1);
printf("- key %d\n", *internal_node_key(node, i));
printf("- key %u\n", *internal_node_key(node, i));
}
child = *internal_node_right_child(node);
print_btree(pager, child, indent_level + 1);
Expand All @@ -74,13 +74,13 @@ void print_btree(pager_t *pager, uint32_t page_num, uint32_t indent_level)
{
num_keys = *leaf_node_num_cells(node);
indent(indent_level);
printf("- leaf (size %d, page %d, parent %d, next %d)\n",
printf("- leaf (size %u, page %u, parent %u, next %u)\n",
num_keys, page_num, *node_parent(node), *leaf_node_next_leaf(node));
// printf("- leaf (size %d)\n", num_keys);
for (uint32_t i = 0; i < num_keys; i++)
{
indent(indent_level + 1);
printf("- %d\n", *leaf_node_key(node, i));
printf("- %u\n", *leaf_node_key(node, i));
}
}
else
Expand Down
2 changes: 1 addition & 1 deletion pager.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pager_t *pager_open(const char *filename)

void *get_page(pager_t *pager, uint32_t page_num)
{
if (page_num > TABLE_MAX_PAGES)
if (page_num >= TABLE_MAX_PAGES)
{
printf("Tried to fetch page number out of bounds. %u > %u\n", page_num, TABLE_MAX_PAGES);
exit(EXIT_FAILURE);
Expand Down
2 changes: 1 addition & 1 deletion statement.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ execute_result_t execute_select(statement_t *statement, table_t *table)
print_row(&row);
cursor_advance(cursor);
}
printf("total %d rows\n", i);
printf("total %u rows\n", i);
free(cursor);
return EXECUTE_SUCCESS;
}
Expand Down
2 changes: 1 addition & 1 deletion table.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ void deserialize_row(void *source, row_t *dest)

void print_row(row_t *row)
{
printf("(%d, %s, %s)\n", row->id, row->username, row->email);
printf("(%u, %s, %s)\n", row->id, row->username, row->email);
}

// opening the database file
Expand Down

0 comments on commit 706cf01

Please sign in to comment.