mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-02-26 03:14:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused variable; help gcc

Browse Source
This commit is contained in:
Chris Young 2016-07-09 00:44:35 +01:00
parent c9daec5567
commit df8aeb4a88
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frontends/amiga/gui.h
View File

@ -94,7 +94,7 @@ struct history_window;
struct gui_window_2 {
struct nsObject *node;
struct Window *win;
Object *objects[GID_LAST];
Object *restrict objects[GID_LAST];
struct gui_window *gw; /* currently-displayed gui_window */
bool redraw_required;
int throbber_frame;
@ -112,22 +112,22 @@ struct gui_window_2 {
int temp;
bool redraw_scroll;
bool new_content;
char *menulab[AMI_MENU_AREXX_MAX + 1];
Object *menuobj[AMI_MENU_AREXX_MAX + 1];
char *restrict menulab[AMI_MENU_AREXX_MAX + 1];
Object *restrict menuobj[AMI_MENU_AREXX_MAX + 1];
char menukey[AMI_MENU_AREXX_MAX + 1];
char *menuicon[AMI_MENU_AREXX_MAX + 1];
char *restrict menuicon[AMI_MENU_AREXX_MAX + 1];
struct Hook menu_hook[AMI_MENU_AREXX_MAX + 1];
UBYTE *menutype;
struct NewMenu *menu;
ULONG hotlist_items;
Object *hotlist_toolbar_lab[AMI_GUI_TOOLBAR_MAX];
Object *restrict hotlist_toolbar_lab[AMI_GUI_TOOLBAR_MAX];
struct List hotlist_toolbar_list;
struct List *web_search_list;
Object *search_bm;
char *svbuffer;
char *status;
char *wintitle;
char *helphints[GID_LAST];
char *restrict svbuffer;
char *restrict status;
char *restrict wintitle;
char *restrict helphints[GID_LAST];
browser_mouse_state prev_mouse_state;
struct timeval lastclick;
struct AppIcon *appicon; /* iconify appicon */
@ -135,8 +135,8 @@ struct gui_window_2 {
struct Hook favicon_hook;
struct Hook throbber_hook;
struct Hook *ctxmenu_hook;
Object *history_ctxmenu[2];
Object *clicktab_ctxmenu;
Object *restrict history_ctxmenu[2];
Object *restrict clicktab_ctxmenu;
gui_drag_type drag_op;
struct IBox *ptr_lock;
struct AppWindow *appwin;

9
frontends/amiga/menu.c
View File

@ -89,8 +89,7 @@ enum {
static bool menu_quit = false;
static bool ami_menu_check_toggled = false;
static BOOL menualreadyinit;
static Object *menu_glyph[NSA_GLYPH_MAX];
static Object *restrict menu_glyph[NSA_GLYPH_MAX];
static int menu_glyph_width[NSA_GLYPH_MAX];
static bool menu_glyphs_loaded = false;
@ -577,7 +576,7 @@ static void ami_menu_alloc_item(struct gui_window_2 *gwin, int num, UBYTE type,
if((num >= AMI_MENU_HOTLIST) && (num <= AMI_MENU_HOTLIST_MAX)) {
utf8_from_local_encoding(label,
(strlen(label) < NSA_MAX_HOTLIST_MENU_LEN) ? strlen(label) : NSA_MAX_HOTLIST_MENU_LEN,
&gwin->menulab[num]);
(char **)&gwin->menulab[num]);
} else if((num >= AMI_MENU_AREXX) && (num < AMI_MENU_AREXX_MAX)) {
gwin->menulab[num] = strdup(label);
} else {
@ -856,8 +855,8 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin)
using label.image if there's a bitmap associated with the item. */
if((gwin->menuicon[i] != NULL) && (gwin->menulab[i] != NM_BARLABEL)) {
int icon_width = 0;
Object *submenuarrow = NULL;
Object *icon = BitMapObj,
Object *restrict submenuarrow = NULL;
Object *restrict icon = BitMapObj,
IA_Scalable, TRUE,
BITMAP_Screen, scrn,
BITMAP_SourceFile, gwin->menuicon[i],