diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-07-09 00:44:35 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-07-09 00:44:35 +0100 |
| commit | df8aeb4a88210b5ce0738b08d96f619f6ce6bfea (patch) | |
| tree | eb0417cfa7445833f42ade722e2a604bbcf4075c /frontends | |
| parent | c9daec556780610d5d4a25f35d06a288294da744 (diff) | |
| download | netsurf-df8aeb4a88210b5ce0738b08d96f619f6ce6bfea.tar.gz netsurf-df8aeb4a88210b5ce0738b08d96f619f6ce6bfea.tar.bz2 | |
Remove unused variable; help gcc
Diffstat (limited to 'frontends')
| -rw-r--r-- | frontends/amiga/gui.h | 22 | ||||
| -rw-r--r-- | frontends/amiga/menu.c | 9 |
2 files changed, 15 insertions, 16 deletions
diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h index 69a103ae9..3addea56d 100644 --- a/frontends/amiga/gui.h +++ b/frontends/amiga/gui.h @@ -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; diff --git a/frontends/amiga/menu.c b/frontends/amiga/menu.c index c7351411c..479bf8188 100644 --- a/frontends/amiga/menu.c +++ b/frontends/amiga/menu.c @@ -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], |