Skip to content

Silence some compiler warnings #38

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

Silence some compiler warnings #38

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
4 changes: 2 additions & 2 deletions heatshrink_decoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ HSD_sink_res heatshrink_decoder_sink(heatshrink_decoder *hsd,
LOG("-- sinking %zd bytes\n", size);
/* copy into input buffer (at head of buffers) */
memcpy(&hsd->buffers[hsd->input_size], in_buf, size);
hsd->input_size += size;
hsd->input_size += (uint16_t)size;
*input_size = size;
return HSDR_SINK_OK;
}
Expand Down Expand Up @@ -279,7 +279,7 @@ static HSD_state st_yield_backref(heatshrink_decoder *hsd,
hsd->head_index++;
LOG(" -- ++ 0x%02x\n", c);
}
hsd->output_count -= count;
hsd->output_count -= (uint16_t)count;
if (hsd->output_count == 0) { return HSDS_TAG_BIT; }
}
return HSDS_YIELD_BACKREF;
Expand Down
12 changes: 6 additions & 6 deletions heatshrink_encoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ heatshrink_encoder *heatshrink_encoder_alloc(uint8_t window_sz2,
HEATSHRINK_FREE(hse, sizeof(*hse) + buf_sz);
return NULL;
}
hse->search_index->size = index_sz;
hse->search_index->size = (uint16_t)index_sz;
#endif

LOG("-- allocated encoder with buffer size of %zu (%u byte input size)\n",
Expand Down Expand Up @@ -149,7 +149,7 @@ HSE_sink_res heatshrink_encoder_sink(heatshrink_encoder *hse,
uint16_t write_offset = get_input_offset(hse) + hse->input_size;
uint16_t ibs = get_input_buffer_size(hse);
uint16_t rem = ibs - hse->input_size;
uint16_t cp_sz = rem < size ? rem : size;
uint16_t cp_sz = rem < size ? rem : (uint16_t)size;

memcpy(&hse->buffer[write_offset], in_buf, cp_sz);
*input_size = cp_sz;
Expand Down Expand Up @@ -533,7 +533,7 @@ static uint8_t push_outgoing_bits(heatshrink_encoder *hse, output_info *oi) {
bits = hse->outgoing_bits >> (hse->outgoing_bits_count - 8);
} else {
count = hse->outgoing_bits_count;
bits = hse->outgoing_bits;
bits = (uint8_t)hse->outgoing_bits;
}

if (count > 0) {
Expand Down Expand Up @@ -592,13 +592,13 @@ static void save_backlog(heatshrink_encoder *hse) {
* used for future matches. Don't bother checking whether the
* input is less than the maximum size, because if it isn't,
* we're done anyway. */
uint16_t rem = input_buf_sz - msi; // unprocessed bytes
uint16_t shift_sz = input_buf_sz + rem;
uint16_t rem = (uint16_t)input_buf_sz - msi; // unprocessed bytes
uint16_t shift_sz = (uint16_t)input_buf_sz + rem;

memmove(&hse->buffer[0],
&hse->buffer[input_buf_sz - rem],
shift_sz);

hse->match_scan_index = 0;
hse->input_size -= input_buf_sz - rem;
hse->input_size -= (uint16_t)input_buf_sz - rem;
}