Skip to content

Commit 278d392

Browse files
committed
Fix lint
1 parent 9e11837 commit 278d392

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

src/config/model.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ static int layout_ini_handler(void* user, const char* section, const char* name,
423423
};
424424
if (! MATCH_SECTION(SECTION_GUI)) {
425425
if(MATCH_SECTION("gui-320x240")
426-
&& (! ELEM_USED(Model.elem[0]) || seen_res != HIRES))
426+
&& (!ELEM_USED(Model.elem[0]) || seen_res != HIRES))
427427
{
428428
seen_res = LOWRES;
429429
offset_x = (LCD_WIDTH - 320) / 2;

src/pages/128x64x1/pages.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ void PAGE_ChangeQuick(int dir)
115115
{
116116
int quick = 0;
117117
for (int i = 0; i < NUM_QUICKPAGES; i++) {
118-
if(Model.quickpage[i] && Model.quickpage[i] == cur_page) {
118+
if (Model.quickpage[i] && Model.quickpage[i] == cur_page) {
119119
quick = i + 1;
120120
break;
121121
}

src/pages/128x64x1/toggle_select.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ static void show_iconsel_page(int SelectedIcon) {
100100
GUI_CreateLabelBox(&gui->togglelabel[i], LABEL_X, row, LABEL_W, LABEL_H, SelectedIcon == i ? &inverted : &DEFAULT_FONT, NULL, NULL, tglidx[i]);
101101
#ifdef HAS_CHAR_ICONS
102102
GUI_CreateLabelBox(&gui->toggleicon[i], ICON_X, row, ICON_W, LABEL_H, &DEFAULT_FONT, TGLICO_font_cb,
103-
NULL, (void *)(long)Model.elem[tp->tglidx].extra.ico[i]);
103+
NULL, (void *)(uintptr_t)Model.elem[tp->tglidx].extra.ico[i]);
104104
#else
105105
struct ImageMap img = TGLICO_GetImage(Model.elem[tp->tglidx].extra.ico[i]);
106106
GUI_CreateImageOffset(&gui->toggleicon[i], ICON_X, row, ICON_W, LABEL_H, img.x_off, img.y_off, img.file,

src/pages/320x240x16/pages.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ void PAGE_ChangeQuick(int dir)
239239
{
240240
int quick = 0;
241241
for (int i = 0; i < NUM_QUICKPAGES; i++) {
242-
if(Model.quickpage[i] && Model.quickpage[i] == cur_page) {
242+
if (Model.quickpage[i] && Model.quickpage[i] == cur_page) {
243243
quick = i+1;
244244
break;
245245
}
@@ -266,7 +266,7 @@ int PAGE_QuickPage(u32 buttons, u8 flags, void *data)
266266
(void)flags;
267267
int i;
268268
for(i = 0; i < NUM_QUICKPAGES; i++)
269-
if(Model.quickpage[i])
269+
if (Model.quickpage[i])
270270
break;
271271
if(i == NUM_QUICKPAGES)
272272
return 0;

src/pages/common/_main_config.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ static const char *dlgts_cb(guiObject_t *obj, int dir, void *data)
175175
Model.elem[idx].src = GUI_TextSelectHelper(Model.elem[idx].src, 0, NUM_TRIMS, dir, 1, 1, NULL);
176176
if (Model.elem[idx].src == 0)
177177
return _tr("None");
178-
snprintf(tempstring, sizeof(tempstring), "%s%d", _tr("Trim"),Model.elem[idx].src);
178+
snprintf(tempstring, sizeof(tempstring), "%s%d", _tr("Trim"), Model.elem[idx].src);
179179
return tempstring;
180180
}
181181
return _tr("None");

src/pages/common/_main_layout.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ void draw_elements()
3838
FullRedraw = redraw_mode;
3939
}
4040
for (i = 0; i < NUM_ELEMS; i++) {
41-
if (! GetWidgetLoc(&Model.elem[i], &x, &y, &w, &h))
41+
if (!GetWidgetLoc(&Model.elem[i], &x, &y, &w, &h))
4242
break;
4343
int type = Model.elem[i].type;
4444
const char *(*strCallback)(guiObject_t *, const void *) = label_cb;

src/pages/common/_main_page.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ void PAGE_MainEvent()
224224
//switch
225225
for (int j = 0; j < 3; j++) {
226226
// Assume switch 0/1/2 are in order
227-
if(Model.elem[i].extra.ico[j] && raw[src+j] > 0) {
227+
if (Model.elem[i].extra.ico[j] && raw[src+j] > 0) {
228228
idx = Model.elem[i].extra.ico[j];
229229
break;
230230
}
@@ -350,7 +350,7 @@ void show_elements()
350350
{
351351
u16 x, y, w, h;
352352
for (int i = 0; i < NUM_ELEMS; i++) {
353-
if (! GetWidgetLoc(&Model.elem[i], &x, &y, &w, &h))
353+
if (!GetWidgetLoc(&Model.elem[i], &x, &y, &w, &h))
354354
break;
355355
int type = Model.elem[i].type;
356356
switch(type) {
@@ -408,7 +408,7 @@ void show_elements()
408408
GUI_CreateLabelBox(&gui->elem[i].box, x, y, 2, 2, &DEFAULT_FONT, TGLICO_font_cb, NULL,
409409
(void *)(uintptr_t)Model.elem[i].extra.ico[0]);
410410
#else
411-
struct ImageMap img = TGLICO_GetImage(Model.elem[i].extra.ico[0]); //We'll set this properly down below
411+
struct ImageMap img = TGLICO_GetImage(Model.elem[i].extra.ico[0]); // We'll set this properly down below
412412
GUI_CreateImageOffset(&gui->elem[i].img, x, y, w, h,
413413
img.x_off, img.y_off, img.file, NULL, NULL);
414414
#endif

src/pages/common/_toggle_select.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ struct ImageMap TGLICO_GetImage(int idx)
8787
void TGLICO_Select(guiObject_t *obj, const void *data)
8888
{
8989
(void)obj;
90-
if(Model.elem[(long)data].src)
90+
if (Model.elem[(uintptr_t)data].src)
9191
{
92-
PAGE_PushByID(PAGEID_TGLEDIT, (long)data);
92+
PAGE_PushByID(PAGEID_TGLEDIT, (uintptr_t)data);
9393
}
9494
}
9595

src/remap_channels.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void RemapChannelsForProtocol(const u8 *oldmap)
106106
}
107107
//Map display
108108
for(i = 0; i < NUM_ELEMS; i++) {
109-
switch(Model.elem[i].type) {
109+
switch (Model.elem[i].type) {
110110
case ELEM_SMALLBOX:
111111
case ELEM_BIGBOX:
112112
_map_inp(chmap, &Model.elem[i].src, NUM_TELEM + NUM_TIMERS + NUM_RTC+1);

0 commit comments

Comments
 (0)