Skip to content
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

Jump to bottom

Fix warnings #40

Merged
merged 1 commit into from
Nov 4, 2022
Merged

Fix warnings #40

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 app/common/view.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ zxerr_t h_review_update_data() {
viewdata.itemCount++;

if (viewdata.pageCount > 1) {
uint8_t keyLen = strnlen(viewdata.key, MAX_CHARS_PER_KEY_LINE);
uint8_t keyLen = (uint8_t) strnlen(viewdata.key, MAX_CHARS_PER_KEY_LINE);
if (keyLen < MAX_CHARS_PER_KEY_LINE) {
snprintf(viewdata.key + keyLen,
MAX_CHARS_PER_KEY_LINE - keyLen,
Expand Down
18 changes: 9 additions & 9 deletions app/common/view_s.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,19 +204,19 @@ const bagl_element_t *view_prepro(const bagl_element_t *element) {
if (!h_paging_can_decrease()){
return NULL;
}
UX_CALLBACK_SET_INTERVAL(2000);
UX_CALLBACK_SET_INTERVAL(2000)
break;
case UIID_ICONRIGHT:
if (!h_paging_can_increase()){
return NULL;
}
UX_CALLBACK_SET_INTERVAL(2000);
UX_CALLBACK_SET_INTERVAL(2000)
break;
case UIID_ICONREVIEW:
if (!h_paging_intro_screen()){
return NULL;
}
UX_CALLBACK_SET_INTERVAL(2000);
UX_CALLBACK_SET_INTERVAL(2000)
break;
case UIID_LABELSCROLL:
UX_CALLBACK_SET_INTERVAL(
Expand All @@ -240,7 +240,7 @@ void h_review_update() {
zxerr_t err = h_review_update_data();
switch(err) {
case zxerr_ok:
UX_DISPLAY(view_review, view_prepro);
UX_DISPLAY(view_review, view_prepro)
break;
default:
view_error_show();
Expand Down Expand Up @@ -298,11 +298,11 @@ void view_idle_show_impl(uint8_t item_idx, char *statusString) {
void view_message_impl(char *title, char *message) {
snprintf(viewdata.key, MAX_CHARS_PER_VALUE_LINE, "%s", title);
snprintf(viewdata.value, MAX_CHARS_PER_VALUE_LINE, "%s", message);
UX_DISPLAY(view_message, view_prepro_idle);
UX_DISPLAY(view_message, view_prepro_idle)
}

void view_error_show_impl() {
UX_DISPLAY(view_error, view_prepro);
UX_DISPLAY(view_error, view_prepro)
}

void h_expert_toggle() {
Expand Down Expand Up @@ -381,7 +381,7 @@ void view_review_show_impl(unsigned int requireReply) {
zxerr_t err = h_review_update_data();
switch(err) {
case zxerr_ok:
UX_DISPLAY(view_review, view_prepro);
UX_DISPLAY(view_review, view_prepro)
break;
default:
view_error_show();
Expand All @@ -391,7 +391,7 @@ void view_review_show_impl(unsigned int requireReply) {

void splitValueField() {
print_value2("");
const uint16_t vlen = strnlen(viewdata.value, MAX_CHARS_PER_VALUE1_LINE);
const uint16_t vlen = (uint16_t) strnlen(viewdata.value, MAX_CHARS_PER_VALUE1_LINE);
if (vlen > MAX_CHARS_PER_VALUE2_LINE - 1) {
snprintf(viewdata.value2, MAX_CHARS_PER_VALUE2_LINE, "%s", viewdata.value + MAX_CHARS_PER_VALUE_LINE);
viewdata.value[MAX_CHARS_PER_VALUE_LINE] = 0;
Expand All @@ -404,7 +404,7 @@ void splitValueAddress() {
exceeding_max = exceed_pixel_in_display(len);
}
print_value2("");
const uint16_t vlen = strnlen(viewdata.value, MAX_CHARS_PER_VALUE1_LINE);
const uint16_t vlen = (uint16_t) strnlen(viewdata.value, MAX_CHARS_PER_VALUE1_LINE);
//if viewdata.value == NULL --> len = 0
if (vlen > len && len > 0) {
snprintf(viewdata.value2, MAX_CHARS_PER_VALUE2_LINE, "%s", viewdata.value + len);
Expand Down
2 changes: 1 addition & 1 deletion include/zxversion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@

#define ZXLIB_MAJOR 14
#define ZXLIB_MINOR 1
#define ZXLIB_PATCH 3
#define ZXLIB_PATCH 4
13 changes: 9 additions & 4 deletions src/zxformat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ size_t asciify_ext(const char *utf8_in, char *ascii_only_out) {
}

uint8_t intstr_to_fpstr_inplace(char *number, size_t number_max_size, uint8_t decimalPlaces) {
uint16_t numChars = strnlen(number, number_max_size);
size_t numChars = strnlen(number, number_max_size);
MEMZERO(number + numChars, number_max_size - numChars);

if (number_max_size < 1) {
Expand All @@ -60,8 +60,8 @@ uint8_t intstr_to_fpstr_inplace(char *number, size_t number_max_size, uint8_t de
}

// Check all are numbers
uint16_t firstDigit = numChars;
for (int i = 0; i < numChars; i++) {
size_t firstDigit = numChars;
for (size_t i = 0; i < numChars; i++) {
if (number[i] < '0' || number[i] > '9') {
snprintf(number, number_max_size, "ERR");
return 0;
Expand Down Expand Up @@ -108,7 +108,12 @@ uint8_t intstr_to_fpstr_inplace(char *number, size_t number_max_size, uint8_t de
number[pointPosition] = '.';

numChars = strnlen(number, number_max_size);
return numChars;

if (numChars > UINT8_MAX) {
// Overflow
return 0;
}
return (uint8_t) numChars;
}

size_t z_strlen(const char *buffer, size_t maxSize) {
Expand Down