Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/4ec70fd3a2e75a3295799... ...commit http://git.netsurf-browser.org/netsurf.git/commit/4ec70fd3a2e75a3295799a6... ...tree http://git.netsurf-browser.org/netsurf.git/tree/4ec70fd3a2e75a3295799a685... The branch, master has been updated via 4ec70fd3a2e75a3295799a685bbeb4dbffcdc05d (commit) via 5bb5e2667df7459c288c3484d3539376a74a7c68 (commit) via 3ea6ca89a0daf4a20ddf9962cc787ed5001f5ab6 (commit) via a36e7aaeb304f688de2f1e01cebf3e295273d633 (commit) via d9d0b1d3aa9ec463cd6110cdfcc7fb67c1baef47 (commit) from ba5bae389b9bfed07e94fc8ec3191f4dcfa714f0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=4ec70fd3a2e75a32957... commit 4ec70fd3a2e75a3295799a685bbeb4dbffcdc05d Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Fix some more cppcheck unread/unusedVariable warnings diff --git a/amiga/gui.c b/amiga/gui.c index ab55bcf..c538525 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -4290,7 +4290,6 @@ static void ami_do_redraw(struct gui_window_2 *gwin) struct IBox *bbox; ULONG oldh = gwin->oldh, oldv=gwin->oldv; struct RastPort *temprp; - hlcache_handle *c; if(browser_window_redraw_ready(gwin->bw) == false) return; @@ -4301,8 +4300,6 @@ static void ami_do_redraw(struct gui_window_2 *gwin) gwin->bw->window->scrollx = hcurrent; gwin->bw->window->scrolly = vcurrent; - c = gwin->bw->current_content; - width=bbox->Width; height=bbox->Height; xoffset=bbox->Left; diff --git a/amiga/print.c b/amiga/print.c index 93dde35..66e5a55 100644 --- a/amiga/print.c +++ b/amiga/print.c @@ -375,7 +375,7 @@ BOOL ami_print_event(struct ami_print_window *pw) void ami_print(struct hlcache_handle *c, int copies) { - double height, print_height; + double height; float scale = nsoption_int(print_scale) / 100.0; if(ami_print_info.msgport == NULL) diff --git a/amiga/theme.c b/amiga/theme.c index 054d465..1e9640f 100644 --- a/amiga/theme.c +++ b/amiga/theme.c @@ -156,7 +156,6 @@ void ami_theme_init(void) void ami_theme_throbber_setup(void) { char throbberfile[1024]; - Object *dto; struct bitmap *bm; ami_get_theme_filename(throbberfile,"theme_throbber",false); commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=5bb5e2667df7459c288... commit 5bb5e2667df7459c288c3484d3539376a74a7c68 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Change the scope of some variables picked up by cppcheck, minor reformatting diff --git a/amiga/clipboard.c b/amiga/clipboard.c index 0f3a33d..fa1d189 100644 --- a/amiga/clipboard.c +++ b/amiga/clipboard.c @@ -189,7 +189,6 @@ void gui_get_clipboard(char **buffer, size_t *length) struct StoredProperty *sp = NULL; ULONG rlen=0,error; struct CSet *cset; - LONG codeset = 0; if(OpenIFF(iffh,IFFF_READ)) return; @@ -203,6 +202,7 @@ void gui_get_clipboard(char **buffer, size_t *length) if(ci = FindCollection(iffh, ID_FTXT, ID_UTF8)) { *buffer = ami_clipboard_cat_collection(ci, 106, length); } else if(ci = FindCollection(iffh, ID_FTXT, ID_CHRS)) { + LONG codeset = 0; if(sp = FindProp(iffh, ID_FTXT, ID_CSET)) { cset = (struct CSet *)sp->sp_Data; codeset = cset->CodeSet; diff --git a/amiga/dt_picture.c b/amiga/dt_picture.c index 1d30928..779e1bc 100644 --- a/amiga/dt_picture.c +++ b/amiga/dt_picture.c @@ -174,7 +174,6 @@ static struct bitmap *amiga_dt_picture_cache_convert(struct content *c) UBYTE *bm_buffer; Object *dto; struct bitmap *bitmap; - unsigned int bm_flags = BITMAP_NEW; #ifdef __amigaos4__ int bm_format = PBPAFMT_RGBA; #else @@ -184,7 +183,7 @@ static struct bitmap *amiga_dt_picture_cache_convert(struct content *c) if(dto = amiga_dt_picture_newdtobject(adt)) { - bitmap = bitmap_create(c->width, c->height, bm_flags); + bitmap = bitmap_create(c->width, c->height, BITMAP_NEW); if (!bitmap) { msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); diff --git a/amiga/file.c b/amiga/file.c index 5d16ceb..008141c 100644 --- a/amiga/file.c +++ b/amiga/file.c @@ -149,23 +149,19 @@ void ami_file_save(int type, char *fname, struct Window *win, struct hlcache_handle *object, struct hlcache_handle *favicon, struct browser_window *bw) { - BPTR lock = 0; + BPTR lock, fh; const char *source_data; ULONG source_size; struct bitmap *bm; - BPTR fh=0; ami_update_pointer(win, GUI_POINTER_WAIT); - if(ami_download_check_overwrite(fname, win, 0)) - { - switch(type) - { + if(ami_download_check_overwrite(fname, win, 0)) { + switch(type) { case AMINS_SAVE_SOURCE: - if((source_data = content_get_source_data(object, &source_size))) - { - if(fh = FOpen(fname, MODE_NEWFILE,0)) - { + if((source_data = content_get_source_data(object, &source_size))) { + BPTR fh; + if(fh = FOpen(fname, MODE_NEWFILE,0)) { FWrite(fh, source_data, 1, source_size); FClose(fh); } @@ -177,8 +173,7 @@ void ami_file_save(int type, char *fname, struct Window *win, break; case AMINS_SAVE_COMPLETE: - if(lock = CreateDir(fname)) - { + if(lock = CreateDir(fname)) { UnLock(lock); save_complete(object, fname, ami_file_set_type); amiga_icon_superimpose_favicon(fname, favicon, NULL); @@ -193,15 +188,13 @@ void ami_file_save(int type, char *fname, struct Window *win, break; case AMINS_SAVE_IFF: - if((bm = content_get_bitmap(object))) - { + if((bm = content_get_bitmap(object))) { bm->url = (char *)nsurl_access(hlcache_handle_get_url(object)); bm->title = (char *)content_get_title(object); bitmap_save(bm, fname, 0); } #ifdef WITH_NS_SVG - else if(ami_mime_compare(object, "svg") == true) - { + else if(ami_mime_compare(object, "svg") == true) { ami_save_svg(object, fname); } #endif diff --git a/amiga/filetype.c b/amiga/filetype.c index bcb6b7e..2d55e1f 100644 --- a/amiga/filetype.c +++ b/amiga/filetype.c @@ -55,9 +55,7 @@ enum const char *fetch_filetype(const char *unix_path) { static char mimetype[50]; - STRPTR ttype = NULL; struct DiskObject *dobj = NULL; - BPTR lock = 0; struct DataType *dtn; BOOL found = FALSE; lwc_string *lwc_mimetype; @@ -66,8 +64,7 @@ const char *fetch_filetype(const char *unix_path) We'll just do a filename check here for quickness, although the first word ought to be checked against WB_DISKMAGIC really. */ - if(strncmp(unix_path + strlen(unix_path) - 5, ".info", 5) == 0) - { + if(strncmp(unix_path + strlen(unix_path) - 5, ".info", 5) == 0) { strcpy(mimetype,"image/x-amiga-icon"); found = TRUE; } @@ -76,32 +73,26 @@ const char *fetch_filetype(const char *unix_path) /* Secondly try getting a tooltype "MIMETYPE" and use that as the MIME type. Will fail over to default icons if the file doesn't have a real icon. */ - if(!found) - { + if(!found) { if(dobj = GetIconTags(unix_path,ICONGETA_FailIfUnavailable,FALSE, - TAG_DONE)) - { + TAG_DONE)) { + STRPTR ttype = NULL; ttype = FindToolType(dobj->do_ToolTypes, "MIMETYPE"); - if(ttype) - { + if(ttype) { strcpy(mimetype,ttype); found = TRUE; } - FreeDiskObject(dobj); } } /* If that didn't work, use the MIME file and DataTypes */ - if(!found) - { - if (lock = Lock (unix_path, ACCESS_READ)) - { - if (dtn = ObtainDataTypeA (DTST_FILE, (APTR)lock, NULL)) - { - if(ami_mime_from_datatype(dtn, &lwc_mimetype, NULL)) - { + if(!found) { + BPTR lock; + if (lock = Lock (unix_path, ACCESS_READ)) { + if (dtn = ObtainDataTypeA (DTST_FILE, (APTR)lock, NULL)) { + if(ami_mime_from_datatype(dtn, &lwc_mimetype, NULL)) { strcpy(mimetype, lwc_string_data(lwc_mimetype)); found = TRUE; ReleaseDataType(dtn); diff --git a/amiga/font_scan.c b/amiga/font_scan.c index f3ad36e..a2738f2 100644 --- a/amiga/font_scan.c +++ b/amiga/font_scan.c @@ -294,7 +294,7 @@ ULONG ami_font_scan_fonts(struct MinList *list, */ ULONG ami_font_scan_list(struct MinList *list) { - int afShortage, afSize = 100, i; + int afShortage, afSize = 100; struct AvailFontsHeader *afh; struct AvailFonts *af; ULONG found = 0; @@ -315,7 +315,7 @@ ULONG ami_font_scan_list(struct MinList *list) if(afh) { af = (struct AvailFonts *)&(afh[1]); - for(i = 0; i < afh->afh_NumEntries; i++) { + for(int i = 0; i < afh->afh_NumEntries; i++) { if(af[i].af_Attr.ta_Style == FS_NORMAL) { if(af[i].af_Attr.ta_Name != NULL) { node = (struct nsObject *)FindIName((struct List *)list, diff --git a/amiga/launch.c b/amiga/launch.c index 0d25bcf..1ccc520 100755 --- a/amiga/launch.c +++ b/amiga/launch.c @@ -126,7 +126,6 @@ void gui_launch_url(const char *url) { APTR procwin = SetProcWindow((APTR)-1L); char *launchurl = NULL; - BPTR fptr = 0; if(ami_openurl_check_list(&ami_unsupportedprotocols, url) == FALSE) { @@ -135,7 +134,7 @@ void gui_launch_url(const char *url) URL_OpenA((STRPTR)url,NULL); } else { if(launchurl = ASPrintf("URL:%s",url)) { - fptr = Open(launchurl,MODE_OLDFILE); + BPTR fptr = Open(launchurl,MODE_OLDFILE); if(fptr) Close(fptr); else ami_openurl_add_protocol(url); FreeVec(launchurl); diff --git a/amiga/menu.c b/amiga/menu.c index 234a958..b2e2334 100644 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -1093,13 +1093,13 @@ static void ami_menu_item_arexx_entries(struct Hook *hook, APTR window, struct I char *script = hook->h_Data; char *temp; struct gui_window_2 *gwin; - BPTR lock = 0; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); if(script) { if(temp = AllocVecTagList(1024, NULL)) { + BPTR lock; if(lock = Lock(nsoption_charp(arexx_dir), SHARED_LOCK)) { DevNameFromLock(lock, temp, 1024, DN_FULLPATH); AddPart(temp, script, 1024); @@ -1110,3 +1110,4 @@ static void ami_menu_item_arexx_entries(struct Hook *hook, APTR window, struct I } } } + diff --git a/amiga/misc.c b/amiga/misc.c index c25c5d5..3f69834 100755 --- a/amiga/misc.c +++ b/amiga/misc.c @@ -43,7 +43,6 @@ void warn_user(const char *warning, const char *detail) Object *req = NULL; char *utf8warning = ami_utf8_easy(messages_get(warning)); STRPTR bodytext = NULL; - LONG result = 0; LOG(("%s %s", warning, detail)); @@ -63,7 +62,7 @@ void warn_user(const char *warning, const char *detail) TAG_DONE); if (req) { - result = IDoMethod(req, RM_OPENREQ, NULL, NULL, scrn); + LONG result = IDoMethod(req, RM_OPENREQ, NULL, NULL, scrn); DisposeObject(req); } diff --git a/amiga/plotters.c b/amiga/plotters.c index 0893c55..de90755 100755 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -473,8 +473,6 @@ bool ami_polygon(const int *p, unsigned int n, const plot_style_t *style) LOG(("[ami_plotter] Entered ami_polygon()")); #endif - int k; - if((nsoption_int(cairo_renderer) < 1) || (palette_mapped == true)) { ULONG cx,cy; @@ -484,7 +482,7 @@ bool ami_polygon(const int *p, unsigned int n, const plot_style_t *style) if(AreaMove(glob->rp,p[0],p[1]) == -1) LOG(("AreaMove: vector list full")); - for(k=1;k<n;k++) + for(int k = 1; k < n; k++) { if(AreaDraw(glob->rp,p[k*2],p[(k*2)+1]) == -1) LOG(("AreaDraw: vector list full")); @@ -501,7 +499,7 @@ bool ami_polygon(const int *p, unsigned int n, const plot_style_t *style) cairo_set_line_width(glob->cr, 0); cairo_move_to(glob->cr, p[0], p[1]); - for (k = 1; k != n; k++) { + for (int k = 1; k != n; k++) { cairo_line_to(glob->cr, p[k * 2], p[k * 2 + 1]); } cairo_fill(glob->cr); diff --git a/amiga/theme.c b/amiga/theme.c index e00e080..054d465 100644 --- a/amiga/theme.c +++ b/amiga/theme.c @@ -289,7 +289,7 @@ void ami_init_mouse_pointers(void) for(i=0;i<=AMI_LASTPOINTER;i++) { - BPTR ptrfile = 0; + BPTR ptrfile; mouseptrbm[i] = NULL; mouseptrobj[i] = NULL; char ptrfname[1024]; commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=3ea6ca89a0daf4a20dd... commit 3ea6ca89a0daf4a20ddf9962cc787ed5001f5ab6 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Fix cppcheck constStatement warning diff --git a/amiga/gui.c b/amiga/gui.c index ad452a6..ab55bcf 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -5178,7 +5178,7 @@ int main(int argc, char** argv) ami_schedule_create(); amiga_plugin_hack_init(); - amiga_datatypes_init(); + ret = amiga_datatypes_init(); /* initialise logging. Not fatal if it fails but not much we * can do about it either. @@ -5200,7 +5200,7 @@ int main(int argc, char** argv) die("NetSurf failed to initialise"); } - amiga_icon_init(); + ret = amiga_icon_init(); gui_init(argc, argv); gui_init2(argc, argv); commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=a36e7aaeb304f688de2... commit a36e7aaeb304f688de2f1e01cebf3e295273d633 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Fix cppcheck syntaxError diff --git a/amiga/context_menu.c b/amiga/context_menu.c index cb350de..e1ce551 100644 --- a/amiga/context_menu.c +++ b/amiga/context_menu.c @@ -364,7 +364,7 @@ void ami_context_menu_add_submenu(Object *ctxmenuobj, ULONG cmsub, void *userdat PMIA_UserData, userdata, PMIA_Disabled, !browser_window_stop_available(userdata), TAG_DONE), - TAG_DONE), + PMEND, TAG_DONE), ~0); break; @@ -410,7 +410,7 @@ void ami_context_menu_add_submenu(Object *ctxmenuobj, ULONG cmsub, void *userdat PMIA_ID, CMID_SAVEURL, PMIA_UserData, userdata, TAG_DONE), - TAG_DONE), + PMEND, TAG_DONE), ~0); break; @@ -467,7 +467,7 @@ void ami_context_menu_add_submenu(Object *ctxmenuobj, ULONG cmsub, void *userdat PMIA_UserData, userdata, PMIA_Disabled, !ami_mime_content_to_cmd(userdata), TAG_DONE), - TAG_DONE), + PMEND, TAG_DONE), ~0); break; commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=d9d0b1d3aa9ec463cd6... commit d9d0b1d3aa9ec463cd6110cdfcc7fb67c1baef47 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Add missing include diff --git a/amiga/icon.c b/amiga/icon.c index a6b61a2..66a008f 100644 --- a/amiga/icon.c +++ b/amiga/icon.c @@ -39,6 +39,7 @@ #include "amiga/os3support.h" #include "amiga/bitmap.h" #include "amiga/icon.h" +#include "amiga/misc.h" #include "desktop/plotters.h" #include "image/bitmap.h" #include "content/content_protected.h" ----------------------------------------------------------------------- Summary of changes: amiga/clipboard.c | 2 +- amiga/context_menu.c | 6 +++--- amiga/dt_picture.c | 3 +-- amiga/file.c | 25 +++++++++---------------- amiga/filetype.c | 29 ++++++++++------------------- amiga/font_scan.c | 4 ++-- amiga/gui.c | 7 ++----- amiga/icon.c | 1 + amiga/launch.c | 3 +-- amiga/menu.c | 3 ++- amiga/misc.c | 3 +-- amiga/plotters.c | 6 ++---- amiga/print.c | 2 +- amiga/theme.c | 3 +-- 14 files changed, 37 insertions(+), 60 deletions(-) diff --git a/amiga/clipboard.c b/amiga/clipboard.c index 0f3a33d..fa1d189 100644 --- a/amiga/clipboard.c +++ b/amiga/clipboard.c @@ -189,7 +189,6 @@ void gui_get_clipboard(char **buffer, size_t *length) struct StoredProperty *sp = NULL; ULONG rlen=0,error; struct CSet *cset; - LONG codeset = 0; if(OpenIFF(iffh,IFFF_READ)) return; @@ -203,6 +202,7 @@ void gui_get_clipboard(char **buffer, size_t *length) if(ci = FindCollection(iffh, ID_FTXT, ID_UTF8)) { *buffer = ami_clipboard_cat_collection(ci, 106, length); } else if(ci = FindCollection(iffh, ID_FTXT, ID_CHRS)) { + LONG codeset = 0; if(sp = FindProp(iffh, ID_FTXT, ID_CSET)) { cset = (struct CSet *)sp->sp_Data; codeset = cset->CodeSet; diff --git a/amiga/context_menu.c b/amiga/context_menu.c index cb350de..e1ce551 100644 --- a/amiga/context_menu.c +++ b/amiga/context_menu.c @@ -364,7 +364,7 @@ void ami_context_menu_add_submenu(Object *ctxmenuobj, ULONG cmsub, void *userdat PMIA_UserData, userdata, PMIA_Disabled, !browser_window_stop_available(userdata), TAG_DONE), - TAG_DONE), + PMEND, TAG_DONE), ~0); break; @@ -410,7 +410,7 @@ void ami_context_menu_add_submenu(Object *ctxmenuobj, ULONG cmsub, void *userdat PMIA_ID, CMID_SAVEURL, PMIA_UserData, userdata, TAG_DONE), - TAG_DONE), + PMEND, TAG_DONE), ~0); break; @@ -467,7 +467,7 @@ void ami_context_menu_add_submenu(Object *ctxmenuobj, ULONG cmsub, void *userdat PMIA_UserData, userdata, PMIA_Disabled, !ami_mime_content_to_cmd(userdata), TAG_DONE), - TAG_DONE), + PMEND, TAG_DONE), ~0); break; diff --git a/amiga/dt_picture.c b/amiga/dt_picture.c index 1d30928..779e1bc 100644 --- a/amiga/dt_picture.c +++ b/amiga/dt_picture.c @@ -174,7 +174,6 @@ static struct bitmap *amiga_dt_picture_cache_convert(struct content *c) UBYTE *bm_buffer; Object *dto; struct bitmap *bitmap; - unsigned int bm_flags = BITMAP_NEW; #ifdef __amigaos4__ int bm_format = PBPAFMT_RGBA; #else @@ -184,7 +183,7 @@ static struct bitmap *amiga_dt_picture_cache_convert(struct content *c) if(dto = amiga_dt_picture_newdtobject(adt)) { - bitmap = bitmap_create(c->width, c->height, bm_flags); + bitmap = bitmap_create(c->width, c->height, BITMAP_NEW); if (!bitmap) { msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); diff --git a/amiga/file.c b/amiga/file.c index 5d16ceb..008141c 100644 --- a/amiga/file.c +++ b/amiga/file.c @@ -149,23 +149,19 @@ void ami_file_save(int type, char *fname, struct Window *win, struct hlcache_handle *object, struct hlcache_handle *favicon, struct browser_window *bw) { - BPTR lock = 0; + BPTR lock, fh; const char *source_data; ULONG source_size; struct bitmap *bm; - BPTR fh=0; ami_update_pointer(win, GUI_POINTER_WAIT); - if(ami_download_check_overwrite(fname, win, 0)) - { - switch(type) - { + if(ami_download_check_overwrite(fname, win, 0)) { + switch(type) { case AMINS_SAVE_SOURCE: - if((source_data = content_get_source_data(object, &source_size))) - { - if(fh = FOpen(fname, MODE_NEWFILE,0)) - { + if((source_data = content_get_source_data(object, &source_size))) { + BPTR fh; + if(fh = FOpen(fname, MODE_NEWFILE,0)) { FWrite(fh, source_data, 1, source_size); FClose(fh); } @@ -177,8 +173,7 @@ void ami_file_save(int type, char *fname, struct Window *win, break; case AMINS_SAVE_COMPLETE: - if(lock = CreateDir(fname)) - { + if(lock = CreateDir(fname)) { UnLock(lock); save_complete(object, fname, ami_file_set_type); amiga_icon_superimpose_favicon(fname, favicon, NULL); @@ -193,15 +188,13 @@ void ami_file_save(int type, char *fname, struct Window *win, break; case AMINS_SAVE_IFF: - if((bm = content_get_bitmap(object))) - { + if((bm = content_get_bitmap(object))) { bm->url = (char *)nsurl_access(hlcache_handle_get_url(object)); bm->title = (char *)content_get_title(object); bitmap_save(bm, fname, 0); } #ifdef WITH_NS_SVG - else if(ami_mime_compare(object, "svg") == true) - { + else if(ami_mime_compare(object, "svg") == true) { ami_save_svg(object, fname); } #endif diff --git a/amiga/filetype.c b/amiga/filetype.c index bcb6b7e..2d55e1f 100644 --- a/amiga/filetype.c +++ b/amiga/filetype.c @@ -55,9 +55,7 @@ enum const char *fetch_filetype(const char *unix_path) { static char mimetype[50]; - STRPTR ttype = NULL; struct DiskObject *dobj = NULL; - BPTR lock = 0; struct DataType *dtn; BOOL found = FALSE; lwc_string *lwc_mimetype; @@ -66,8 +64,7 @@ const char *fetch_filetype(const char *unix_path) We'll just do a filename check here for quickness, although the first word ought to be checked against WB_DISKMAGIC really. */ - if(strncmp(unix_path + strlen(unix_path) - 5, ".info", 5) == 0) - { + if(strncmp(unix_path + strlen(unix_path) - 5, ".info", 5) == 0) { strcpy(mimetype,"image/x-amiga-icon"); found = TRUE; } @@ -76,32 +73,26 @@ const char *fetch_filetype(const char *unix_path) /* Secondly try getting a tooltype "MIMETYPE" and use that as the MIME type. Will fail over to default icons if the file doesn't have a real icon. */ - if(!found) - { + if(!found) { if(dobj = GetIconTags(unix_path,ICONGETA_FailIfUnavailable,FALSE, - TAG_DONE)) - { + TAG_DONE)) { + STRPTR ttype = NULL; ttype = FindToolType(dobj->do_ToolTypes, "MIMETYPE"); - if(ttype) - { + if(ttype) { strcpy(mimetype,ttype); found = TRUE; } - FreeDiskObject(dobj); } } /* If that didn't work, use the MIME file and DataTypes */ - if(!found) - { - if (lock = Lock (unix_path, ACCESS_READ)) - { - if (dtn = ObtainDataTypeA (DTST_FILE, (APTR)lock, NULL)) - { - if(ami_mime_from_datatype(dtn, &lwc_mimetype, NULL)) - { + if(!found) { + BPTR lock; + if (lock = Lock (unix_path, ACCESS_READ)) { + if (dtn = ObtainDataTypeA (DTST_FILE, (APTR)lock, NULL)) { + if(ami_mime_from_datatype(dtn, &lwc_mimetype, NULL)) { strcpy(mimetype, lwc_string_data(lwc_mimetype)); found = TRUE; ReleaseDataType(dtn); diff --git a/amiga/font_scan.c b/amiga/font_scan.c index f3ad36e..a2738f2 100644 --- a/amiga/font_scan.c +++ b/amiga/font_scan.c @@ -294,7 +294,7 @@ ULONG ami_font_scan_fonts(struct MinList *list, */ ULONG ami_font_scan_list(struct MinList *list) { - int afShortage, afSize = 100, i; + int afShortage, afSize = 100; struct AvailFontsHeader *afh; struct AvailFonts *af; ULONG found = 0; @@ -315,7 +315,7 @@ ULONG ami_font_scan_list(struct MinList *list) if(afh) { af = (struct AvailFonts *)&(afh[1]); - for(i = 0; i < afh->afh_NumEntries; i++) { + for(int i = 0; i < afh->afh_NumEntries; i++) { if(af[i].af_Attr.ta_Style == FS_NORMAL) { if(af[i].af_Attr.ta_Name != NULL) { node = (struct nsObject *)FindIName((struct List *)list, diff --git a/amiga/gui.c b/amiga/gui.c index ad452a6..c538525 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -4290,7 +4290,6 @@ static void ami_do_redraw(struct gui_window_2 *gwin) struct IBox *bbox; ULONG oldh = gwin->oldh, oldv=gwin->oldv; struct RastPort *temprp; - hlcache_handle *c; if(browser_window_redraw_ready(gwin->bw) == false) return; @@ -4301,8 +4300,6 @@ static void ami_do_redraw(struct gui_window_2 *gwin) gwin->bw->window->scrollx = hcurrent; gwin->bw->window->scrolly = vcurrent; - c = gwin->bw->current_content; - width=bbox->Width; height=bbox->Height; xoffset=bbox->Left; @@ -5178,7 +5175,7 @@ int main(int argc, char** argv) ami_schedule_create(); amiga_plugin_hack_init(); - amiga_datatypes_init(); + ret = amiga_datatypes_init(); /* initialise logging. Not fatal if it fails but not much we * can do about it either. @@ -5200,7 +5197,7 @@ int main(int argc, char** argv) die("NetSurf failed to initialise"); } - amiga_icon_init(); + ret = amiga_icon_init(); gui_init(argc, argv); gui_init2(argc, argv); diff --git a/amiga/icon.c b/amiga/icon.c index a6b61a2..66a008f 100644 --- a/amiga/icon.c +++ b/amiga/icon.c @@ -39,6 +39,7 @@ #include "amiga/os3support.h" #include "amiga/bitmap.h" #include "amiga/icon.h" +#include "amiga/misc.h" #include "desktop/plotters.h" #include "image/bitmap.h" #include "content/content_protected.h" diff --git a/amiga/launch.c b/amiga/launch.c index 0d25bcf..1ccc520 100755 --- a/amiga/launch.c +++ b/amiga/launch.c @@ -126,7 +126,6 @@ void gui_launch_url(const char *url) { APTR procwin = SetProcWindow((APTR)-1L); char *launchurl = NULL; - BPTR fptr = 0; if(ami_openurl_check_list(&ami_unsupportedprotocols, url) == FALSE) { @@ -135,7 +134,7 @@ void gui_launch_url(const char *url) URL_OpenA((STRPTR)url,NULL); } else { if(launchurl = ASPrintf("URL:%s",url)) { - fptr = Open(launchurl,MODE_OLDFILE); + BPTR fptr = Open(launchurl,MODE_OLDFILE); if(fptr) Close(fptr); else ami_openurl_add_protocol(url); FreeVec(launchurl); diff --git a/amiga/menu.c b/amiga/menu.c index 234a958..b2e2334 100644 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -1093,13 +1093,13 @@ static void ami_menu_item_arexx_entries(struct Hook *hook, APTR window, struct I char *script = hook->h_Data; char *temp; struct gui_window_2 *gwin; - BPTR lock = 0; GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); if(script) { if(temp = AllocVecTagList(1024, NULL)) { + BPTR lock; if(lock = Lock(nsoption_charp(arexx_dir), SHARED_LOCK)) { DevNameFromLock(lock, temp, 1024, DN_FULLPATH); AddPart(temp, script, 1024); @@ -1110,3 +1110,4 @@ static void ami_menu_item_arexx_entries(struct Hook *hook, APTR window, struct I } } } + diff --git a/amiga/misc.c b/amiga/misc.c index c25c5d5..3f69834 100755 --- a/amiga/misc.c +++ b/amiga/misc.c @@ -43,7 +43,6 @@ void warn_user(const char *warning, const char *detail) Object *req = NULL; char *utf8warning = ami_utf8_easy(messages_get(warning)); STRPTR bodytext = NULL; - LONG result = 0; LOG(("%s %s", warning, detail)); @@ -63,7 +62,7 @@ void warn_user(const char *warning, const char *detail) TAG_DONE); if (req) { - result = IDoMethod(req, RM_OPENREQ, NULL, NULL, scrn); + LONG result = IDoMethod(req, RM_OPENREQ, NULL, NULL, scrn); DisposeObject(req); } diff --git a/amiga/plotters.c b/amiga/plotters.c index 0893c55..de90755 100755 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -473,8 +473,6 @@ bool ami_polygon(const int *p, unsigned int n, const plot_style_t *style) LOG(("[ami_plotter] Entered ami_polygon()")); #endif - int k; - if((nsoption_int(cairo_renderer) < 1) || (palette_mapped == true)) { ULONG cx,cy; @@ -484,7 +482,7 @@ bool ami_polygon(const int *p, unsigned int n, const plot_style_t *style) if(AreaMove(glob->rp,p[0],p[1]) == -1) LOG(("AreaMove: vector list full")); - for(k=1;k<n;k++) + for(int k = 1; k < n; k++) { if(AreaDraw(glob->rp,p[k*2],p[(k*2)+1]) == -1) LOG(("AreaDraw: vector list full")); @@ -501,7 +499,7 @@ bool ami_polygon(const int *p, unsigned int n, const plot_style_t *style) cairo_set_line_width(glob->cr, 0); cairo_move_to(glob->cr, p[0], p[1]); - for (k = 1; k != n; k++) { + for (int k = 1; k != n; k++) { cairo_line_to(glob->cr, p[k * 2], p[k * 2 + 1]); } cairo_fill(glob->cr); diff --git a/amiga/print.c b/amiga/print.c index 93dde35..66e5a55 100644 --- a/amiga/print.c +++ b/amiga/print.c @@ -375,7 +375,7 @@ BOOL ami_print_event(struct ami_print_window *pw) void ami_print(struct hlcache_handle *c, int copies) { - double height, print_height; + double height; float scale = nsoption_int(print_scale) / 100.0; if(ami_print_info.msgport == NULL) diff --git a/amiga/theme.c b/amiga/theme.c index e00e080..1e9640f 100644 --- a/amiga/theme.c +++ b/amiga/theme.c @@ -156,7 +156,6 @@ void ami_theme_init(void) void ami_theme_throbber_setup(void) { char throbberfile[1024]; - Object *dto; struct bitmap *bm; ami_get_theme_filename(throbberfile,"theme_throbber",false); @@ -289,7 +288,7 @@ void ami_init_mouse_pointers(void) for(i=0;i<=AMI_LASTPOINTER;i++) { - BPTR ptrfile = 0; + BPTR ptrfile; mouseptrbm[i] = NULL; mouseptrobj[i] = NULL; char ptrfname[1024]; -- NetSurf Browser