From 673f3e6887586c31e3f2507c6fd021c1e2c07209 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Fri, 15 Jan 2016 19:58:24 +0000 Subject: Fix some old and new GCC errors/warnings --- amiga/arexx.c | 2 +- amiga/clipboard.c | 3 +-- amiga/drag.c | 5 ++--- amiga/font_bitmap.c | 2 +- amiga/font_bullet.c | 1 + amiga/font_cache.c | 2 +- amiga/gui.c | 8 ++++---- amiga/history_local.c | 5 +---- amiga/icon.c | 13 +++++-------- amiga/menu.c | 5 ++--- 10 files changed, 19 insertions(+), 27 deletions(-) diff --git a/amiga/arexx.c b/amiga/arexx.c index 45f35f051..1960af0c1 100644 --- a/amiga/arexx.c +++ b/amiga/arexx.c @@ -145,7 +145,7 @@ void ami_arexx_execute(char *script) char full_script_path[1025]; BPTR lock; - if(lock = Lock(script, ACCESS_READ)) { + if((lock = Lock(script, ACCESS_READ))) { DevNameFromLock(lock, full_script_path, 1024, DN_FULLPATH); LOG("Executing script: %s", full_script_path); IDoMethod(arexx_obj, AM_EXECUTE, full_script_path, NULL, NULL, NULL, NULL, NULL); diff --git a/amiga/clipboard.c b/amiga/clipboard.c index 10f0faf8f..92bf4df66 100644 --- a/amiga/clipboard.c +++ b/amiga/clipboard.c @@ -175,7 +175,6 @@ static void gui_get_clipboard(char **buffer, size_t *length) { struct CollectionItem *ci = NULL; struct StoredProperty *sp = NULL; - ULONG error; struct CSet *cset; if(OpenIFF(iffh,IFFF_READ)) return; @@ -185,7 +184,7 @@ static void gui_get_clipboard(char **buffer, size_t *length) if(CollectionChunk(iffh,ID_FTXT,ID_UTF8)) return; if(StopOnExit(iffh, ID_FTXT, ID_FORM)) return; - error = ParseIFF(iffh,IFFPARSE_SCAN); + ParseIFF(iffh,IFFPARSE_SCAN); if((ci = FindCollection(iffh, ID_FTXT, ID_UTF8))) { *buffer = ami_clipboard_cat_collection(ci, 106, length); diff --git a/amiga/drag.c b/amiga/drag.c index 7aef426d0..67d17223e 100644 --- a/amiga/drag.c +++ b/amiga/drag.c @@ -183,7 +183,7 @@ void ami_drag_save(struct Window *win) break; default: - LOG("Unsupported drag save operation %ld", drag_save); + LOG("Unsupported drag save operation %d", drag_save); break; } @@ -197,7 +197,6 @@ void ami_drag_icon_show(struct Window *win, const char *type) { struct DiskObject *dobj = NULL; ULONG width, height; - int err; int deftype = WBPROJECT; drag_in_progress = TRUE; @@ -218,7 +217,7 @@ void ami_drag_icon_show(struct Window *win, const char *type) ICONGETA_GetDefaultType, deftype, TAG_DONE); - err = IconControl(dobj, + IconControl(dobj, ICONCTRLA_GetWidth,&width, ICONCTRLA_GetHeight,&height, TAG_DONE); diff --git a/amiga/font_bitmap.c b/amiga/font_bitmap.c index d9459b029..e1a135744 100644 --- a/amiga/font_bitmap.c +++ b/amiga/font_bitmap.c @@ -104,7 +104,7 @@ static size_t ami_font_bm_convert_local_to_utf8_offset(const char *utf8string, i { size_t chr = 0; - for(int i = 0; i < offset; i++) { + for(size_t i = 0; i < offset; i++) { chr = utf8_next(utf8string, length, chr); } diff --git a/amiga/font_bullet.c b/amiga/font_bullet.c index 432ae8838..72a2d90b2 100644 --- a/amiga/font_bullet.c +++ b/amiga/font_bullet.c @@ -24,6 +24,7 @@ #include #endif #include +#include #include #include diff --git a/amiga/font_cache.c b/amiga/font_cache.c index 09f9ef8ae..c94afb124 100644 --- a/amiga/font_cache.c +++ b/amiga/font_cache.c @@ -110,7 +110,7 @@ static void ami_font_cache_cleanup(struct MinList *ami_font_cache_list) #ifdef __amigaos4__ static void ami_font_cache_del_skiplist(struct SkipList *skiplist) { - struct ami_font_cache_node *node; + struct SkipNode *node; struct SkipNode *nnode; node = (struct ami_font_cache_node *)GetFirstSkipNode(skiplist); diff --git a/amiga/gui.c b/amiga/gui.c index 6744d997d..4490438c6 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -1838,9 +1838,9 @@ static void ami_set_border_gadget_size(struct gui_window_2 *gwin) { #ifdef __amigaos4__ /* Reset gadget widths according to new calculation */ - ULONG size1, size2, sz; + ULONG size1, size2; - sz = ami_get_border_gadget_size(gwin, &size1, &size2); + ami_get_border_gadget_size(gwin, &size1, &size2); RefreshSetGadgetAttrs((struct Gadget *)(APTR)gwin->objects[GID_STATUS], gwin->win, NULL, @@ -4322,10 +4322,10 @@ gui_window_create(struct browser_window *bw, if(nsoption_bool(kiosk_mode) == false) { #ifdef __amigaos4__ - ULONG sz, width, height; + ULONG width, height; struct DrawInfo *dri = GetScreenDrawInfo(scrn); - sz = ami_get_border_gadget_size(g->shared, + ami_get_border_gadget_size(g->shared, (ULONG *)&width, (ULONG *)&height); g->shared->objects[GID_STATUS] = NewObject( diff --git a/amiga/history_local.c b/amiga/history_local.c index 39456496c..20d54386f 100755 --- a/amiga/history_local.c +++ b/amiga/history_local.c @@ -190,7 +190,7 @@ static bool ami_history_click(struct history_window *hw, uint16 code) { int x, y; struct IBox *bbox; - ULONG width,height,xs,ys; + ULONG xs, ys; if(ami_gui_get_space_box(hw->objects[GID_BROWSER], &bbox) != NSERROR_OK) { warn_user("NoMemory", ""); @@ -202,9 +202,6 @@ static bool ami_history_click(struct history_window *hw, uint16 code) GetAttr(SCROLLER_Top,hw->objects[OID_VSCROLL],(ULONG *)&ys); y = hw->win->MouseY - bbox->Top + ys; - width=bbox->Width; - height=bbox->Height; - ami_gui_free_space_box(bbox); switch(code) diff --git a/amiga/icon.c b/amiga/icon.c index fd39fddde..f77f2eb6e 100644 --- a/amiga/icon.c +++ b/amiga/icon.c @@ -142,7 +142,6 @@ bool amiga_icon_convert(struct content *c) ULONG size; int width = 0, height = 0; long format = 0; - int err; uint8 r, g, b, a; ULONG offset; char *filename = NULL; @@ -171,7 +170,7 @@ bool amiga_icon_convert(struct content *c) return false; } - err = IconControl(dobj, + IconControl(dobj, ICONCTRLA_GetImageDataFormat,&format, ICONCTRLA_GetWidth,&width, ICONCTRLA_GetHeight,&height, @@ -199,7 +198,7 @@ bool amiga_icon_convert(struct content *c) return false; } - err = IconControl(dobj, + IconControl(dobj, ICONCTRLA_GetImageData1, &imagebufptr, TAG_DONE); @@ -365,11 +364,10 @@ void amiga_icon_superimpose_favicon_internal(struct hlcache_handle *icon, struct ULONG *icondata1, *icondata2; ULONG width, height; long format = 0; - int err; if(dobj == NULL) return; - err = IconControl(dobj, + IconControl(dobj, ICONCTRLA_GetImageDataFormat,&format, ICONCTRLA_GetImageData1,&icondata1, ICONCTRLA_GetImageData2,&icondata2, @@ -421,7 +419,6 @@ void amiga_icon_superimpose_favicon(char *path, struct hlcache_handle *icon, cha ULONG *icondata1, *icondata2; ULONG width, height; long format = 0; - int err; ULONG trans1, pals1; ULONG trans2, pals2; struct ColorRegister *pal1; @@ -444,7 +441,7 @@ void amiga_icon_superimpose_favicon(char *path, struct hlcache_handle *icon, cha if(dobj == NULL) return; - err = IconControl(dobj, + IconControl(dobj, ICONCTRLA_GetImageDataFormat,&format, ICONCTRLA_GetImageData1,&icondata1, ICONCTRLA_GetImageData2,&icondata2, @@ -469,7 +466,7 @@ void amiga_icon_superimpose_favicon(char *path, struct hlcache_handle *icon, cha icondata2 = amiga_icon_convertcolouricon32((UBYTE *)icondata2, width, height, trans2, pals2, pal2, 0xff); - err = IconControl(dobj, + IconControl(dobj, ICONCTRLA_SetImageDataFormat, IDFMT_DIRECTMAPPED, ICONCTRLA_SetImageData1, icondata1, ICONCTRLA_SetImageData2, icondata2, diff --git a/amiga/menu.c b/amiga/menu.c index 831b8f7f5..7f7b5b31a 100644 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -124,10 +124,9 @@ HOOKF(void, ami_menu_item_project_newwin, APTR, window, struct IntuiMessage *) HOOKF(void, ami_menu_item_project_newtab, APTR, window, struct IntuiMessage *) { struct gui_window_2 *gwin; - nserror error; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - error = ami_gui_new_blank_tab(gwin); + ami_gui_new_blank_tab(gwin); } HOOKF(void, ami_menu_item_project_open, APTR, window, struct IntuiMessage *) @@ -792,7 +791,7 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin) { int i, j; int txtlen = 0; - int left_posn; + int left_posn = 0; struct RastPort *rp = &scrn->RastPort; struct DrawInfo *dri = GetScreenDrawInfo(scrn); int space_width = TextLength(rp, " ", 1); -- cgit v1.2.3