Created
December 11, 2024 13:11
-
-
Save zeha/883ebdb77879614bcabe375147bbd5f2 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From: Chris Hofstaedtler <[email protected]> | |
Date: Wed, 11 Dec 2024 13:54:46 +0100 | |
X-Dgit-Generated: 0.1.1-11.2 596481d5fcce3065fe9f98b5e130547ac18ea17a | |
Subject: Fix various bugs exposed by gcc-14 | |
--- | |
diff --git a/src/t4k_menu.c b/src/t4k_menu.c | |
index a0b272f..d6d1633 100644 | |
--- a/src/t4k_menu.c | |
+++ b/src/t4k_menu.c | |
@@ -164,6 +164,11 @@ void set_font_size_explicitly(MenuNode* menu, int size); | |
void set_menu_font_size(MenuNode* menu); | |
int binsearch(int min_f, int max_f, const char* text); | |
+static void _internal_T4K_PrerenderAll(int resx, int resy) { | |
+ /* internal wrapper to avoid changing ABI */ | |
+ T4K_PrerenderAll(); | |
+} | |
+ | |
/* | |
functions initializing the menu module | |
(they shoul be called before any other menu activity) | |
@@ -219,7 +224,8 @@ MenuNode *menu_TranslateNode(xmlNode *node) { | |
int i; | |
if(node->type == XML_ELEMENT_NODE) { | |
- xmlAttr *current, *child; | |
+ xmlAttr *current = NULL; | |
+ xmlNode *child = NULL; | |
tnode = create_empty_node(); | |
for(current = node->properties; current; current = current->next) { | |
@@ -262,7 +268,7 @@ MenuNode *menu_TranslateNode(xmlNode *node) { | |
return tnode; | |
} | |
-MenuNode *menu_LoadFile(char *file) { | |
+MenuNode *menu_LoadFile(const char *file) { | |
xmlDoc *menu; | |
xmlNode *root; | |
@@ -443,7 +449,7 @@ int T4K_RunMenu(int index, bool return_choice, void (*draw_background)(), int (* | |
int click_flag = 1; | |
int using_scroll = 0; | |
- internal_res_switch_handler(&T4K_PrerenderAll); | |
+ internal_res_switch_handler(&_internal_T4K_PrerenderAll); | |
for(;;) /* one loop body execution for one menu page */ | |
{ | |
@@ -874,7 +880,7 @@ int T4K_RunMenu(int index, bool return_choice, void (*draw_background)(), int (* | |
char_width = desc_chars_per_line(T4K_TOOLTIP_FONTSIZE); | |
T4K_LineWrapInsBreaks(desc, out, char_width, 64, 64); | |
// desc_prerendered = T4K_SimpleText(out, T4K_TOOLTIP_FONTSIZE, &yellow); | |
- if (desc != "") | |
+ if (desc[0] != '\0') | |
desc_prerendered = T4K_BlackOutline(out, T4K_TOOLTIP_FONTSIZE, &yellow); | |
} | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment