diff options
author | John Tytgat <joty@netsurf-browser.org> | 2004-08-14 14:30:12 +0000 |
---|---|---|
committer | John Tytgat <joty@netsurf-browser.org> | 2004-08-14 14:30:12 +0000 |
commit | 402c4ca66c7d95b1cdfc9eefbcb94947c807155b (patch) | |
tree | dbc42a5d9357d6c03d6c479bf6792754116f8adb /riscos/help.c | |
parent | 7d3a242132eedadbcb96bead6dbed64729d11aaf (diff) | |
download | netsurf-402c4ca66c7d95b1cdfc9eefbcb94947c807155b.tar.gz netsurf-402c4ca66c7d95b1cdfc9eefbcb94947c807155b.tar.bz2 |
[project @ 2004-08-14 14:30:10 by joty]
Removed a chunk of Norcroft compiler warnings. Re-ident some pieces.
svn path=/import/netsurf/; revision=1231
Diffstat (limited to 'riscos/help.c')
-rw-r--r-- | riscos/help.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/riscos/help.c b/riscos/help.c index 1ba514f95..6a7f7a696 100644 --- a/riscos/help.c +++ b/riscos/help.c @@ -51,7 +51,7 @@ of numbers representing the menu structure (eg 'HelpBrowserMenu3-1-2'). If '<key><identifier>' is not available, then simply '<key>' is then used. For example if 'HelpToolbar7' is not available then 'HelpToolbar' is then tried. - + If an item is greyed out then a suffix of 'g' is added (eg 'HelpToolbar7g'). For this to work, windows must have bit 4 of the window flag byte set and the user must be running RISC OS 5.03 or greater. @@ -126,11 +126,11 @@ void ro_gui_interactive_help_request(wimp_message *message) { } else if (hotlist_toolbar && window == hotlist_toolbar->toolbar_handle) { sprintf(message_token, "HelpHotToolbar%i", (int)icon); - } else if ((g = ro_gui_window_lookup(window))) { + } else if ((g = ro_gui_window_lookup(window)) != NULL) { sprintf(message_token, "HelpBrowser%i", (int)icon); - } else if ((g = ro_gui_toolbar_lookup(window))) { + } else if ((g = ro_gui_toolbar_lookup(window)) != NULL) { sprintf(message_token, "HelpToolbar%i", (int)icon); - } else if ((g = ro_gui_status_lookup(window))) { + } else if ((g = ro_gui_status_lookup(window)) != NULL) { sprintf(message_token, "HelpStatus%i", (int)icon); } @@ -142,7 +142,7 @@ void ro_gui_interactive_help_request(wimp_message *message) { if ((icon >= 0) && (ro_gui_get_icon_shaded_state(window, icon))) { strcat(message_token, "g"); } - + /* Broadcast out message */ ro_gui_interactive_help_broadcast(message, &message_token[0]); @@ -183,7 +183,7 @@ void ro_gui_interactive_help_request(wimp_message *message) { */ greyed |= test_menu->entries[menu_tree.items[index]].icon_flags & wimp_ICON_SHADED; test_menu = test_menu->entries[menu_tree.items[index]].sub_menu; - + /* Continue adding the entries */ if (index == 0) { @@ -230,7 +230,7 @@ static void ro_gui_interactive_help_broadcast(wimp_message *message, char *token base_token = token; while (base_token[0] != 0x00) { if ((base_token[0] == '-') || - ((base_token[0] >= '0') && (base_token[0] <= '9'))) { + ((base_token[0] >= '0') && (base_token[0] <= '9'))) { base_token[0] = 0x00; } else { ++base_token; @@ -242,7 +242,7 @@ static void ro_gui_interactive_help_broadcast(wimp_message *message, char *token translated_token = messages_get(token); } } - + /* Copy our message string */ |