diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2015-05-28 16:08:46 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2015-05-28 16:08:46 +0100 |
| commit | c105738fa36bb2400adc47399c5b878d252d1c86 (patch) | |
| tree | 138eeb449e1bf51ee1726b5f820740aada0ccd0b /riscos | |
| parent | 20f2c86a511f7913cf858e7bd3668b0b59663ba0 (diff) | |
| download | netsurf-c105738fa36bb2400adc47399c5b878d252d1c86.tar.gz netsurf-c105738fa36bb2400adc47399c5b878d252d1c86.tar.bz2 | |
Change LOG() macro to be varadic
This changes the LOG macro to be varadic removing the need for all
callsites to have double bracketing and allows for future improvement
on how we use the logging macros.
The callsites were changed with coccinelle and the changes checked by
hand. Compile tested for several frontends but not all.
A formatting annotation has also been added which allows the compiler
to check the parameters and types passed to the logging.
Diffstat (limited to 'riscos')
49 files changed, 656 insertions, 1153 deletions
diff --git a/riscos/401login.c b/riscos/401login.c index 16d35c8f7..acb7a0165 100644 --- a/riscos/401login.c +++ b/riscos/401login.c @@ -194,8 +194,7 @@ void ro_gui_401login_close(wimp_w w) error = xwimp_delete_window(w); if (error) { - LOG(("xwimp_delete_window: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xwimp_delete_window: 0x%x:%s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } ro_gui_wimp_event_finalise(w); @@ -216,7 +215,7 @@ bool ro_gui_401login_apply(wimp_w w) auth = malloc(strlen(session->uname) + strlen(session->pwd) + 2); if (!auth) { - LOG(("calloc failed")); + LOG("calloc failed"); warn_user("NoMemory", 0); return false; } diff --git a/riscos/bitmap.c b/riscos/bitmap.c index 2cc85c4b7..384895d32 100644 --- a/riscos/bitmap.c +++ b/riscos/bitmap.c @@ -282,8 +282,7 @@ bool riscos_bitmap_save(void *vbitmap, const char *path, unsigned flags) error = xosspriteop_save_sprite_file(osspriteop_USER_AREA, (bitmap->sprite_area), path); if (error) { - LOG(("xosspriteop_save_sprite_file: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosspriteop_save_sprite_file: 0x%x: %s", error->errnum, error->errmess); warn_user("SaveError", error->errmess); return false; } @@ -343,8 +342,7 @@ bool riscos_bitmap_save(void *vbitmap, const char *path, unsigned flags) error = xosfind_openoutw(0, path, NULL, &fw); if (error) { - LOG(("xosfind_openoutw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfind_openoutw: 0x%x: %s", error->errnum, error->errmess); free(chunk_buf); warn_user("SaveError", error->errmess); return false; @@ -358,7 +356,7 @@ bool riscos_bitmap_save(void *vbitmap, const char *path, unsigned flags) if (!error) error = xosgbpb_writew(fw, (byte*)p, image_size, NULL); if (error) { - LOG(("xosgbpb_writew: 0x%x: %s", error->errnum, error->errmess)); + LOG("xosgbpb_writew: 0x%x: %s", error->errnum, error->errmess); free(chunk_buf); xosfind_closew(fw); warn_user("SaveError", error->errmess); @@ -403,8 +401,7 @@ bool riscos_bitmap_save(void *vbitmap, const char *path, unsigned flags) } error = xosgbpb_writew(fw, (byte*)chunk_buf, dp-chunk_buf, NULL); if (error) { - LOG(("xosgbpb_writew: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosgbpb_writew: 0x%x: %s", error->errnum, error->errmess); free(chunk_buf); xosfind_closew(fw); warn_user("SaveError", error->errmess); @@ -414,15 +411,13 @@ bool riscos_bitmap_save(void *vbitmap, const char *path, unsigned flags) error = xosfind_closew(fw); if (error) { - LOG(("xosfind_closew: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfind_closew: 0x%x: %s", error->errnum, error->errmess); warn_user("SaveError", error->errmess); } error = xosfile_set_type(path, osfile_TYPE_SPRITE); if (error) { - LOG(("xosfile_set_type: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_set_type: 0x%x: %s", error->errnum, error->errmess); warn_user("SaveError", error->errmess); } @@ -509,8 +504,7 @@ void riscos_bitmap_overlay_sprite(struct bitmap *bitmap, (osspriteop_id)s, &w, &h, NULL, NULL); if (error) { - LOG(("xosspriteop_read_sprite_info: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xosspriteop_read_sprite_info: 0x%x:%s", error->errnum, error->errmess); return; } sp_offset = ((s->width + 1) * 4) - w; @@ -592,7 +586,7 @@ static osspriteop_area *thumbnail_create_8bpp(struct bitmap *bitmap) sprite_area = (osspriteop_area *)malloc(area_size); if (!sprite_area) { - LOG(("no memory for malloc()")); + LOG("no memory for malloc()"); return NULL; } sprite_area->size = area_size; @@ -760,7 +754,7 @@ static void thumbnail_test(void) area_size = sizeof(osspriteop_area) + sizeof(osspriteop_header) + sizeof(int); if ((sprite_area = (osspriteop_area *)malloc(area_size)) == NULL) { - LOG(("Insufficient memory to perform sprite test.")); + LOG("Insufficient memory to perform sprite test."); return; } sprite_area->size = area_size + 1; @@ -792,7 +786,7 @@ nserror riscos_bitmap_render(struct bitmap *bitmap, assert(content); assert(bitmap); - LOG(("content %p in bitmap %p", content, bitmap)); + LOG("content %p in bitmap %p", content, bitmap); /* check if we have access to 32bpp sprites natively */ if (thumbnail_32bpp_available == -1) { diff --git a/riscos/buffer.c b/riscos/buffer.c index a8cb7fdf5..e5c73359a 100644 --- a/riscos/buffer.c +++ b/riscos/buffer.c @@ -98,9 +98,7 @@ void ro_gui_buffer_open(wimp_draw *redraw) */ if ((clipping.x1 < clipping.x0) || (clipping.y1 < clipping.y0)) { - LOG(("Invalid clipping rectangle (%i, %i) to (%i,%i)", - clipping.x0, clipping.y0, - clipping.x1, clipping.y1)); + LOG("Invalid clipping rectangle (%i, %i) to (%i,%i)", clipping.x0, clipping.y0, clipping.x1, clipping.y1); return; } @@ -131,7 +129,7 @@ void ro_gui_buffer_open(wimp_draw *redraw) (word_width * sprite_size.y * 4) + palette_size; buffer = (osspriteop_area *)malloc(total_size); if (!buffer) { - LOG(("Failed to allocate memory")); + LOG("Failed to allocate memory"); ro_gui_buffer_free(); return; } @@ -142,7 +140,7 @@ void ro_gui_buffer_open(wimp_draw *redraw) mode = tinct_SPRITE_MODE; #else if ((error = xwimpreadsysinfo_wimp_mode(&mode)) != NULL) { - LOG(("Error reading mode '%s'", error->errmess)); + LOG("Error reading mode '%s'", error->errmess); ro_gui_buffer_free(); return; } @@ -164,7 +162,7 @@ void ro_gui_buffer_open(wimp_draw *redraw) error = xos_read_vdu_variables(PTR_OS_VDU_VAR_LIST(&vars), vals); if (error) { - LOG(("Error reading mode properties '%s'", error->errmess)); + LOG("Error reading mode properties '%s'", error->errmess); ro_gui_buffer_free(); return; } @@ -209,7 +207,7 @@ void ro_gui_buffer_open(wimp_draw *redraw) buffer, buffer_name, palette, clipping.x0, clipping.y0, clipping.x1, clipping.y1)) != NULL) { - LOG(("Grab error '%s'", error->errmess)); + LOG("Grab error '%s'", error->errmess); ro_gui_buffer_free(); return; } @@ -218,7 +216,7 @@ void ro_gui_buffer_open(wimp_draw *redraw) */ if ((error = xosspriteop_read_save_area_size(osspriteop_PTR, buffer, (osspriteop_id)(buffer + 1), &size)) != NULL) { - LOG(("Save area error '%s'", error->errmess)); + LOG("Save area error '%s'", error->errmess); ro_gui_buffer_free(); return; } @@ -233,7 +231,7 @@ void ro_gui_buffer_open(wimp_draw *redraw) if ((error = xosspriteop_switch_output_to_sprite(osspriteop_PTR, buffer, (osspriteop_id)(buffer + 1), save_area, &context0, &context1, &context2, &context3)) != NULL) { - LOG(("Switching error '%s'", error->errmess)); + LOG("Switching error '%s'", error->errmess); free(save_area); ro_gui_buffer_free(); return; @@ -249,7 +247,7 @@ void ro_gui_buffer_open(wimp_draw *redraw) */ if ((error = xos_set_ecf_origin(-ro_plot_origin_x, -ro_plot_origin_y)) != NULL) { - LOG(("Invalid ECF origin: '%s'", error->errmess)); + LOG("Invalid ECF origin: '%s'", error->errmess); } } diff --git a/riscos/configure.c b/riscos/configure.c index 68aa3c0c6..62937b543 100644 --- a/riscos/configure.c +++ b/riscos/configure.c @@ -212,8 +212,7 @@ void ro_gui_configure_open_window(wimp_open *open) y + configure_icon_height - CONFIGURE_ICON_PADDING_V); if (error) { - LOG(("xwimp_resize_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess); } x += configure_icon_width; l++; @@ -226,8 +225,7 @@ void ro_gui_configure_open_window(wimp_open *open) error = xwimp_force_redraw(configure_window, 0, -16384, 16384, 0); if (error) { - LOG(("xwimp_force_redraw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_force_redraw: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -250,8 +248,7 @@ void ro_gui_configure_open_window(wimp_open *open) extent.y0 = -max_height; error = xwimp_set_extent(open->w, &extent); if (error) { - LOG(("xwimp_set_extent: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_extent: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -262,8 +259,7 @@ void ro_gui_configure_open_window(wimp_open *open) /* open the window */ error = xwimp_open_window(open); if (error) { - LOG(("xwimp_open_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -280,7 +276,7 @@ void ro_gui_configure_register(const char *window, /* create our tool */ tool = calloc(sizeof(struct configure_tool), 1); if (!tool) { - LOG(("Insufficient memory for calloc()")); + LOG("Insufficient memory for calloc()"); die("Insufficient memory"); return; /* For the benefit of scan-build */ } @@ -288,7 +284,7 @@ void ro_gui_configure_register(const char *window, tool->translated[0] = '\0'; tool->validation = malloc(strlen(window) + 2); if (!tool->validation) { - LOG(("Insufficient memory for malloc()")); + LOG("Insufficient memory for malloc()"); die("Insufficient memory"); } sprintf(tool->validation, "S%s", window); @@ -315,8 +311,7 @@ void ro_gui_configure_register(const char *window, CONFIGURE_TOOL_TRANSLATED_SIZE; error = xwimp_create_icon(&new_icon, &tool->i); if (error) { - LOG(("xwimp_create_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess); die(error->errmess); } @@ -365,8 +360,7 @@ bool ro_gui_configure_translate(void) error = xosbyte1(osbyte_ALPHABET_NUMBER, 127, 0, &alphabet); if (error) { - LOG(("failed reading alphabet: 0x%x: %s", - error->errnum, error->errmess)); + LOG("failed reading alphabet: 0x%x: %s", error->errnum, error->errmess); /* assume Latin1 */ alphabet = territory_ALPHABET_LATIN1; } @@ -387,8 +381,7 @@ bool ro_gui_configure_translate(void) error = xwimptextop_string_width(tool->translated, strlen(tool->translated), &icon_width); if (error) { - LOG(("xwimptextop_string_width: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimptextop_string_width: 0x%x: %s", error->errnum, error->errmess); return false; } icon_width += CONFIGURE_ICON_PADDING_H; @@ -402,8 +395,7 @@ bool ro_gui_configure_translate(void) configure_icon_width, 0); if (error) { - LOG(("xwimp_resize_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess); } } diff --git a/riscos/configure/con_language.c b/riscos/configure/con_language.c index ace7a6fdf..48c20fc46 100644 --- a/riscos/configure/con_language.c +++ b/riscos/configure/con_language.c @@ -99,7 +99,7 @@ bool ro_gui_options_language_ok(wimp_w w) if (temp) { nsoption_set_charp(language, temp); } else { - LOG(("No memory to duplicate language code")); + LOG("No memory to duplicate language code"); warn_user("NoMemory", 0); } } @@ -114,7 +114,7 @@ bool ro_gui_options_language_ok(wimp_w w) if (temp) { nsoption_set_charp(accept_language,temp); } else { - LOG(("No memory to duplicate language code")); + LOG("No memory to duplicate language code"); warn_user("NoMemory", 0); } } diff --git a/riscos/configure/con_theme.c b/riscos/configure/con_theme.c index 13ba3165c..bee2231cd 100644 --- a/riscos/configure/con_theme.c +++ b/riscos/configure/con_theme.c @@ -102,23 +102,20 @@ bool ro_gui_options_theme_initialise(wimp_w w) return false; error = xwimp_create_window(&theme_pane_definition, &theme_pane); if (error) { - LOG(("xwimp_create_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_window: 0x%x: %s", error->errnum, error->errmess); return false; } state.w = w; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); return false; } icon_state.w = w; icon_state.i = THEME_PANE_AREA; error = xwimp_get_icon_state(&icon_state); if (error) { - LOG(("xwimp_get_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess); return false; } state.w = theme_pane; @@ -127,7 +124,7 @@ bool ro_gui_options_theme_initialise(wimp_w w) state.visible.x0 += icon_state.icon.extent.x0 + 16; state.visible.y0 = state.visible.y1 + icon_state.icon.extent.y0 + 16; state.visible.y1 += icon_state.icon.extent.y1 - 28; - LOG(("Y0 = %i, y1 = %i", icon_state.icon.extent.y0, icon_state.icon.extent.y1)); + LOG("Y0 = %i, y1 = %i", icon_state.icon.extent.y0, icon_state.icon.extent.y1); error = xwimp_open_window_nested(PTR_WIMP_OPEN(&state), w, wimp_CHILD_LINKS_PARENT_VISIBLE_BOTTOM_OR_LEFT << wimp_CHILD_XORIGIN_SHIFT | @@ -142,8 +139,7 @@ bool ro_gui_options_theme_initialise(wimp_w w) wimp_CHILD_LINKS_PARENT_VISIBLE_TOP_OR_RIGHT << wimp_CHILD_TS_EDGE_SHIFT); if (error) { - LOG(("xwimp_open_window_nested: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window_nested: 0x%x: %s", error->errnum, error->errmess); return false; } @@ -178,8 +174,7 @@ void ro_gui_options_theme_finalise(wimp_w w) ro_gui_wimp_event_finalise(theme_pane); error = xwimp_delete_window(theme_pane); if (error) { - LOG(("xwimp_delete_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_delete_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } theme_pane = 0; @@ -272,7 +267,7 @@ void ro_gui_options_theme_load(void) ro_toolbar_rebuild(toolbar); toolbar_display = calloc(sizeof(struct toolbar_display), 1); if (!toolbar_display) { - LOG(("No memory for calloc()")); + LOG("No memory for calloc()"); warn_user("NoMemory", 0); return; } @@ -294,8 +289,7 @@ void ro_gui_options_theme_load(void) state.w = theme_pane; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } diff --git a/riscos/content-handlers/artworks.c b/riscos/content-handlers/artworks.c index 80733c680..9ec04a7e5 100644 --- a/riscos/content-handlers/artworks.c +++ b/riscos/content-handlers/artworks.c @@ -179,7 +179,7 @@ bool artworks_convert(struct content *c) xos_read_var_val_size("Alias$LoadArtWorksModules", 0, os_VARTYPE_STRING, &used, NULL, NULL); if (used >= 0) { - LOG(("Alias$LoadArtWorksModules not defined")); + LOG("Alias$LoadArtWorksModules not defined"); msg_data.error = messages_get("AWNotSeen"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); return false; @@ -188,8 +188,7 @@ bool artworks_convert(struct content *c) /* load the modules, or do nothing if they're already loaded */ error = xos_cli("LoadArtWorksModules"); if (error) { - LOG(("xos_cli: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xos_cli: 0x%x: %s", error->errnum, error->errmess); msg_data.error = error->errmess; content_broadcast(c, CONTENT_MSG_ERROR, msg_data); return false; @@ -199,8 +198,7 @@ bool artworks_convert(struct content *c) error = (os_error*)_swix(AWRender_FileInitAddress, _OUT(0) | _OUT(1), &init_routine, &init_workspace); if (error) { - LOG(("AWRender_FileInitAddress: 0x%x: %s", - error->errnum, error->errmess)); + LOG("AWRender_FileInitAddress: 0x%x: %s", error->errnum, error->errmess); msg_data.error = error->errmess; content_broadcast(c, CONTENT_MSG_ERROR, msg_data); return false; @@ -210,8 +208,7 @@ bool artworks_convert(struct content *c) &aw->render_routine, &aw->render_workspace); if (error) { - LOG(("AWRender_RenderAddress: 0x%x: %s", - error->errnum, error->errmess)); + LOG("AWRender_RenderAddress: 0x%x: %s", error->errnum, error->errmess); msg_data.error = error->errmess; content_broadcast(c, CONTENT_MSG_ERROR, msg_data); return false; @@ -223,8 +220,7 @@ bool artworks_convert(struct content *c) error = awrender_init(&source_data, &source_size, init_routine, init_workspace); if (error) { - LOG(("awrender_init: 0x%x : %s", - error->errnum, error->errmess)); + LOG("awrender_init: 0x%x : %s", error->errnum, error->errmess); msg_data.error = error->errmess; content_broadcast(c, CONTENT_MSG_ERROR, msg_data); return false; @@ -239,14 +235,13 @@ bool artworks_convert(struct content *c) &aw->y1); if (error) { - LOG(("AWRender_DocBounds: 0x%x: %s", - error->errnum, error->errmess)); + LOG("AWRender_DocBounds: 0x%x: %s", error->errnum, error->errmess); msg_data.error = error->errmess; content_broadcast(c, CONTENT_MSG_ERROR, msg_data); return false; } - LOG(("bounding box: %d,%d,%d,%d", aw->x0, aw->y0, aw->x1, aw->y1)); + LOG("bounding box: %d,%d,%d,%d", aw->x0, aw->y0, aw->x1, aw->y1); /* create the resizable workspace required by the ArtWorksRenderer rendering routine */ @@ -254,7 +249,7 @@ bool artworks_convert(struct content *c) aw->size = INITIAL_BLOCK_SIZE; aw->block = malloc(INITIAL_BLOCK_SIZE); if (!aw->block) { - LOG(("failed to create block for ArtworksRenderer")); + LOG("failed to create block for ArtworksRenderer"); msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); return false; @@ -369,15 +364,13 @@ bool artworks_redraw(struct content *c, struct content_redraw_data *data, error = xos_read_vdu_variables(PTR_OS_VDU_VAR_LIST(&vars), vals); if (error) { - LOG(("xos_read_vdu_variables: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xos_read_vdu_variables: 0x%x: %s", error->errnum, error->errmess); return false; } error = xwimp_read_palette((os_palette*)&vals[3]); if (error) { - LOG(("xwimp_read_palette: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_read_palette: 0x%x: %s", error->errnum, error->errmess); return false; } @@ -396,8 +389,7 @@ bool artworks_redraw(struct content *c, struct content_redraw_data *data, aw->render_workspace); if (error) { - LOG(("awrender_render: 0x%x: %s", - error->errnum, error->errmess)); + LOG("awrender_render: 0x%x: %s", error->errnum, error->errmess); return false; } diff --git a/riscos/content-handlers/draw.c b/riscos/content-handlers/draw.c index 552423980..c2524d496 100644 --- a/riscos/content-handlers/draw.c +++ b/riscos/content-handlers/draw.c @@ -122,8 +122,7 @@ bool draw_convert(struct content *c) error = xdrawfile_bbox(0, (drawfile_diagram *) data, (int) source_size, 0, &bbox); if (error) { - LOG(("xdrawfile_bbox: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xdrawfile_bbox: 0x%x: %s", error->errnum, error->errmess); msg_data.error = error->errmess; content_broadcast(c, CONTENT_MSG_ERROR, msg_data); return false; @@ -205,8 +204,7 @@ bool draw_redraw(struct content *c, struct content_redraw_data *data, error = xdrawfile_render(0, (drawfile_diagram *) src_data, (int) source_size, &matrix, 0, 0); if (error) { - LOG(("xdrawfile_render: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xdrawfile_render: 0x%x: %s", error->errnum, error->errmess); return false; } diff --git a/riscos/content-handlers/sprite.c b/riscos/content-handlers/sprite.c index 3d669ad2d..2b2813273 100644 --- a/riscos/content-handlers/sprite.c +++ b/riscos/content-handlers/sprite.c @@ -131,8 +131,7 @@ bool sprite_convert(struct content *c) (osspriteop_id) ((char *) area + area->first), &w, &h, NULL, NULL); if (error) { - LOG(("xosspriteop_read_sprite_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosspriteop_read_sprite_info: 0x%x: %s", error->errnum, error->errmess); msg_data.error = error->errmess; content_broadcast(c, CONTENT_MSG_ERROR, msg_data); return false; diff --git a/riscos/cookies.c b/riscos/cookies.c index 835229835..83462cbd6 100644 --- a/riscos/cookies.c +++ b/riscos/cookies.c @@ -109,7 +109,7 @@ void ro_gui_cookies_postinitialise(void) cookies_window.toolbar, &ro_cookies_treeview_callbacks, TREE_COOKIES); if (cookies_window.tv == NULL) { - LOG(("Failed to allocate treeview")); + LOG("Failed to allocate treeview"); return; } diff --git a/riscos/dialog.c b/riscos/dialog.c index a8c05e801..e5c972f66 100644 --- a/riscos/dialog.c +++ b/riscos/dialog.c @@ -216,8 +216,7 @@ wimp_w ro_gui_dialog_create(const char *template_name) window->sprite_area = gui_sprites; error = xwimp_create_window(window, &w); if (error) { - LOG(("xwimp_create_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_window: 0x%x: %s", error->errnum, error->errmess); xwimp_close_template(); die(error->errmess); } @@ -256,13 +255,12 @@ wimp_window * ro_gui_dialog_load_template(const char *template_name) error = xwimp_load_template(wimp_GET_SIZE, 0, 0, wimp_NO_FONTS, name, 0, &window_size, &data_size, &context); if (error) { - LOG(("xwimp_load_template: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_load_template: 0x%x: %s", error->errnum, error->errmess); xwimp_close_template(); die(error->errmess); } if (!context) { - LOG(("template '%s' missing", template_name)); + LOG("template '%s' missing", template_name); xwimp_close_template(); die("Template"); } @@ -279,8 +277,7 @@ wimp_window * ro_gui_dialog_load_template(const char *template_name) error = xwimp_load_template(window, data, data + data_size, wimp_NO_FONTS, name, 0, 0, 0, 0); if (error) { - LOG(("xwimp_load_template: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_load_template: 0x%x: %s", error->errnum, error->errmess); xwimp_close_template(); die(error->errmess); } @@ -308,8 +305,7 @@ void ro_gui_dialog_open(wimp_w w) state.w = w; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -356,8 +352,7 @@ void ro_gui_dialog_close(wimp_w close) */ error = xwimp_get_caret_position(&caret); if (error) { - LOG(("xwimp_get_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } else if (caret.w == close) { /* Check if we are a persistent window */ @@ -368,9 +363,7 @@ void ro_gui_dialog_close(wimp_w close) 32, -1); /* parent may have been closed first */ if ((error) && (error->errnum != 0x287)) { - LOG(("xwimp_set_caret_position: 0x%x: %s", - error->errnum, - error->errmess)); + LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -378,8 +371,7 @@ void ro_gui_dialog_close(wimp_w close) error = xwimp_close_window(close); if (error) { - LOG(("xwimp_close_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_close_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -464,8 +456,7 @@ void ro_gui_dialog_open_at_pointer(wimp_w w) /* get the pointer position */ error = xwimp_get_pointer_info(&ptr); if (error) { - LOG(("xwimp_get_pointer_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_pointer_info: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -488,8 +479,7 @@ void ro_gui_dialog_open_xy(wimp_w w, int x, int y) state.w = w; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -504,8 +494,7 @@ void ro_gui_dialog_open_xy(wimp_w w, int x, int y) * on screen */ error = xwimp_close_window(w); if (error) { - LOG(("xwimp_close_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_close_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -533,8 +522,7 @@ void ro_gui_dialog_open_centre_parent(wimp_w parent, wimp_w child) { state.w = parent; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -551,8 +539,7 @@ void ro_gui_dialog_open_centre_parent(wimp_w parent, wimp_w child) { state.w = child; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -614,7 +601,7 @@ void ro_gui_dialog_add_persistent(wimp_w parent, wimp_w w) { return; } } - LOG(("Unable to map persistent dialog to parent.")); + LOG("Unable to map persistent dialog to parent."); return; } @@ -643,8 +630,7 @@ void ro_gui_dialog_close_persistent(wimp_w parent) { w = persistent_dialog[i].dialog; ro_gui_dialog_close(w); if (ro_gui_wimp_event_close_window(w)) - LOG(("Persistent dialog close event: 0x%x", - (unsigned) w)); + LOG("Persistent dialog close event: 0x%x", (unsigned)w); persistent_dialog[i].parent = NULL; persistent_dialog[i].dialog = NULL; } @@ -722,7 +708,7 @@ static bool ro_gui_dialog_open_url_init(void) if ((definition->icons[ICON_OPENURL_URL].flags & wimp_ICON_INDIRECTED) == 0) { - LOG(("open_url URL icon not indirected")); + LOG("open_url URL icon not indirected"); xwimp_close_template(); die("Template"); } @@ -740,8 +726,7 @@ static bool ro_gui_dialog_open_url_init(void) error = xwimp_create_window(definition, &dialog_openurl); if (error != NULL) { - LOG(("xwimp_create_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_window: 0x%x: %s", error->errnum, error->errmess); xwimp_close_template(); die(error->errmess); } diff --git a/riscos/download.c b/riscos/download.c index 7570a1ca0..659587455 100644 --- a/riscos/download.c +++ b/riscos/download.c @@ -259,8 +259,7 @@ static nserror download_ro_filetype(download_context *ctx, bits *ftype_out) mime_type = download_context_get_mime_type(ctx); error = xmimemaptranslate_mime_type_to_filetype(mime_type, &ftype); if (error) { - LOG(("xmimemaptranslate_mime_type_to_filetype: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xmimemaptranslate_mime_type_to_filetype: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); ftype = 0xffd; } @@ -338,8 +337,7 @@ gui_download_window_create(download_context *ctx, struct gui_window *gui) error = xosfind_openoutw(osfind_NO_PATH | osfind_ERROR_IF_DIR, temp_name, 0, &dw->file); if (error) { - LOG(("xosfind_openoutw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfind_openoutw: 0x%x: %s", error->errnum, error->errmess); warn_user("SaveError", error->errmess); free(dw); return 0; @@ -372,7 +370,7 @@ gui_download_window_create(download_context *ctx, struct gui_window *gui) filename = strdup(temp_name); if (filename == NULL) { - LOG(("Failed to establish download filename.")); + LOG("Failed to establish download filename."); warn_user("SaveError", error->errmess); free(dw); return 0; @@ -404,7 +402,7 @@ gui_download_window_create(download_context *ctx, struct gui_window *gui) if (err != NSERROR_OK) { /* badenc should never happen */ assert(err !=NSERROR_BAD_ENCODING); - LOG(("utf8_to_local_encoding failed")); + LOG("utf8_to_local_encoding failed"); warn_user("NoMemory", 0); free(dw); return 0; @@ -430,8 +428,7 @@ gui_download_window_create(download_context *ctx, struct gui_window *gui) /* create and open the download window */ error = xwimp_create_window(download_template, &dw->window); if (error) { - LOG(("xwimp_create_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); free(dw); return 0; @@ -486,8 +483,7 @@ static void gui_download_window_error(struct gui_download_window *dw, wimp_COLOUR_RED << wimp_ICON_FG_COLOUR_SHIFT, wimp_ICON_FG_COLOUR); if (error) { - LOG(("xwimp_set_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -495,8 +491,7 @@ static void gui_download_window_error(struct gui_download_window *dw, error = xwimp_set_icon_state(dw->window, ICON_DOWNLOAD_PATH, wimp_ICON_SHADED, 0); if (error) { - LOG(("xwimp_set_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -504,8 +499,7 @@ static void gui_download_window_error(struct gui_download_window *dw, error = xwimp_set_icon_state(dw->window, ICON_DOWNLOAD_ICON, wimp_ICON_SHADED, wimp_ICON_SHADED); if (error) { - LOG(("xwimp_set_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -532,12 +526,11 @@ static nserror gui_download_window_data(struct gui_download_window *dw, error = xosgbpb_writew(dw->file, (const byte *) data, size, &unwritten); if (error) { - LOG(("xosgbpb_writew: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosgbpb_writew: 0x%x: %s", error->errnum, error->errmess); msg = error->errmess; } else if (unwritten) { - LOG(("xosgbpb_writew: unwritten %i", unwritten)); + LOG("xosgbpb_writew: unwritten %i", unwritten); msg = messages_get("Unwritten"); } else { @@ -560,23 +553,20 @@ static nserror gui_download_window_data(struct gui_download_window *dw, error = xwimp_set_icon_state(dw->window, ICON_DOWNLOAD_ICON, wimp_ICON_SHADED, 0); if (error) { - LOG(("xwimp_set_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } error = xwimp_set_icon_state(dw->window, ICON_DOWNLOAD_DESTINATION, wimp_ICON_DELETED, wimp_ICON_DELETED); if (error) { - LOG(("xwimp_set_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } error = xwimp_set_icon_state(dw->window, ICON_DOWNLOAD_PATH, wimp_ICON_DELETED, 0); if (error) { - LOG(("xwimp_set_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -725,15 +715,13 @@ void ro_gui_download_update_status(struct gui_download_window *dw) download_progress_x0 + width, download_progress_y1); if (error) { - LOG(("xwimp_resize_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } error = xwimp_set_icon_state(dw->window, ICON_DOWNLOAD_STATUS, 0, 0); if (error) { - LOG(("xwimp_set_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -769,15 +757,13 @@ void ro_gui_download_window_hide_caret(struct gui_download_window *dw) error = xwimp_get_caret_position(&caret); if (error) { - LOG(("xwimp_get_caret_position: 0x%x : %s", - error->errnum, error->errmess)); + LOG("xwimp_get_caret_position: 0x%x : %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } else if (caret.w == dw->window) { error = xwimp_set_caret_position(dw->window, (wimp_i)-1, 0, 0, 1 << 25, -1); if (error) { - LOG(("xwimp_get_caret_position: 0x%x : %s", - error->errnum, error->errmess)); + LOG("xwimp_get_caret_position: 0x%x : %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -803,8 +789,7 @@ static void gui_download_window_done(struct gui_download_window *dw) error = xosfind_closew(dw->file); if (error) { - LOG(("xosfind_closew: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfind_closew: 0x%x: %s", error->errnum, error->errmess); warn_user("SaveError", error->errmess); } dw->file = 0; @@ -813,8 +798,7 @@ static void gui_download_window_done(struct gui_download_window *dw) error = xosfile_set_type(dw->path, dw->file_type); if (error) { - LOG(("xosfile_set_type: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_set_type: 0x%x: %s", error->errnum, error->errmess); warn_user("SaveError", error->errmess); } @@ -870,8 +854,7 @@ bool ro_gui_download_click(wimp_pointer *pointer) *dot = 0; error = xos_cli(command); if (error) { - LOG(("xos_cli: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xos_cli: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); } } @@ -944,8 +927,7 @@ static void ro_gui_download_drag_end(wimp_dragged *drag, void *data) error = xwimp_get_pointer_info(&pointer); if (error) { - LOG(("xwimp_get_pointer_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_pointer_info: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -975,8 +957,7 @@ static void ro_gui_download_drag_end(wimp_dragged *drag, void *data) error = xwimp_send_message_to_window(wimp_USER_MESSAGE, &message, pointer.w, pointer.i, 0); if (error) { - LOG(("xwimp_send_message_to_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_send_message_to_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -1028,8 +1009,7 @@ char *ro_gui_download_canonicalise(const char *path) error = xosfscontrol_canonicalise_path(path, NULL, NULL, NULL, 0, &spare); if (error) { - LOG(("xosfscontrol_canonicalise_path: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfscontrol_canonicalise_path: 0x%x: %s", error->errnum, error->errmess); return NULL; } @@ -1038,8 +1018,7 @@ char *ro_gui_download_canonicalise(const char *path) error = xosfscontrol_canonicalise_path(path, buf, NULL, NULL, 1 - spare, NULL); if (error) { - LOG(("xosfscontrol_canonicalise_path: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfscontrol_canonicalise_path: 0x%x: %s", error->errnum, error->errmess); free(buf); return NULL; @@ -1084,15 +1063,13 @@ bool ro_gui_download_check_space(struct gui_download_window *dw, error = xosfscontrol_free_space64(dir, &free_lo, &free_hi, &max_file, NULL, NULL); if (error) { - LOG(("xosfscontrol_free_space64: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfscontrol_free_space64: 0x%x: %s", error->errnum, error->errmess); free_hi = 0; error = xosfscontrol_free_space(dir, (int*)&free_lo, &max_file, NULL); if (error) { - LOG(("xosfscontrol_free_space: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfscontrol_free_space: 0x%x: %s", error->errnum, error->errmess); /* close our eyes and hope */ free(dir); return true; @@ -1129,8 +1106,7 @@ bool ro_gui_download_check_space(struct gui_download_window *dw, error = xosargs_read_allocation(dw->file, &allocation); if (error) { - LOG(("xosargs_read_allocation: 0x%x : %s", - error->errnum, error->errmess)); + LOG("xosargs_read_allocation: 0x%x : %s", error->errnum, error->errmess); } else { space += allocation; @@ -1169,8 +1145,7 @@ os_error *ro_gui_download_move(struct gui_download_window *dw, error = xosfind_closew(dw->file); dw->file = 0; if (error) { - LOG(("xosfind_closew: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfind_closew: 0x%x: %s", error->errnum, error->errmess); return error; } } @@ -1188,13 +1163,11 @@ os_error *ro_gui_download_move(struct gui_download_window *dw, osfscontrol_COPY_LOOK, 0, 0, 0, 0, 0); if (error) { - LOG(("xosfscontrol_copy: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfscontrol_copy: 0x%x: %s", error->errnum, error->errmess); return error; } } else if (error) { - LOG(("xosfscontrol_rename: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfscontrol_rename: 0x%x: %s", error->errnum, error->errmess); return error; } @@ -1204,23 +1177,20 @@ os_error *ro_gui_download_move(struct gui_download_window *dw, fileswitch_ATTR_OWNER_READ | fileswitch_ATTR_OWNER_WRITE); if (error) { - LOG(("xosfile_write: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_write: 0x%x: %s", error->errnum, error->errmess); warn_user("SaveError", error->errmess); } error = xosfind_openupw(osfind_NO_PATH | osfind_ERROR_IF_DIR, dest_file, 0, &dw->file); if (error) { - LOG(("xosfind_openupw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfind_openupw: 0x%x: %s", error->errnum, error->errmess); return error; } error = xosargs_set_ptrw(dw->file, dw->received); if (error) { - LOG(("xosargs_set_ptrw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosargs_set_ptrw: 0x%x: %s", error->errnum, error->errmess); return error; } @@ -1229,8 +1199,7 @@ os_error *ro_gui_download_move(struct gui_download_window *dw, error = xosfile_set_type(dest_file, dw->file_type); if (error) { - LOG(("xosfile_set_type: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_set_type: 0x%x: %s", error->errnum, error->errmess); warn_user("SaveError", error->errmess); } } @@ -1302,7 +1271,7 @@ bool ro_gui_download_save(struct gui_download_window *dw, error = xosfile_read_stamped(file_name, &obj_type, NULL, NULL, NULL, NULL, NULL); if (error) { - LOG(("xosfile_read_stamped: 0x%x:%s", error->errnum, error->errmess)); + LOG("xosfile_read_stamped: 0x%x:%s", error->errnum, error->errmess); return false; } @@ -1338,14 +1307,12 @@ bool ro_gui_download_save(struct gui_download_window *dw, error = xosfind_openupw(osfind_NO_PATH | osfind_ERROR_IF_DIR, temp_name, 0, &dw->file); if (error) { - LOG(("xosfind_openupw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfind_openupw: 0x%x: %s", error->errnum, error->errmess); } else { error = xosargs_set_ptrw(dw->file, dw->received); if (error) { - LOG(("xosargs_set_ptrw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosargs_set_ptrw: 0x%x: %s", error->errnum, error->errmess); } } @@ -1367,8 +1334,7 @@ bool ro_gui_download_save(struct gui_download_window *dw, error = xwimp_set_icon_state(dw->window, ICON_DOWNLOAD_ICON, wimp_ICON_SHADED, wimp_ICON_SHADED); if (error) { - LOG(("xwimp_set_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -1381,15 +1347,13 @@ bool ro_gui_download_save(struct gui_download_window *dw, error = xwimp_set_icon_state(dw->window, ICON_DOWNLOAD_PATH, wimp_ICON_DELETED, wimp_ICON_DELETED); if (error) { - LOG(("xwimp_set_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } error = xwimp_set_icon_state(dw->window, ICON_DOWNLOAD_DESTINATION, wimp_ICON_DELETED, 0); if (error) { - LOG(("xwimp_set_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -1435,8 +1399,7 @@ void ro_gui_download_send_dataload(struct gui_download_window *dw) * for the rather depressing details. */ if (error && error->errnum != error_WIMP_BAD_HANDLE) { - LOG(("xwimp_set_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -1517,8 +1480,7 @@ bool ro_gui_download_window_destroy(struct gui_download_window *dw, bool quit) /* delete window */ error = xwimp_delete_window(dw->window); if (error) { - LOG(("xwimp_delete_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_delete_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } ro_gui_wimp_event_finalise(dw->window); @@ -1527,8 +1489,7 @@ bool ro_gui_download_window_destroy(struct gui_download_window *dw, bool quit) if (dw->file) { error = xosfind_closew(dw->file); if (error) { - LOG(("xosfind_closew: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfind_closew: 0x%x: %s", error->errnum, error->errmess); warn_user("SaveError", error->errmess); } } @@ -1539,8 +1500,7 @@ bool ro_gui_download_window_destroy(struct gui_download_window *dw, bool quit) error = xosfile_delete(temp_name, 0, 0, 0, 0, 0); if (error) { - LOG(("xosfile_delete: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_delete: 0x%x: %s", error->errnum, error->errmess); warn_user("SaveError", error->errmess); } } diff --git a/riscos/filetype.c b/riscos/filetype.c index 0a546d833..a0de46ecf 100644 --- a/riscos/filetype.c +++ b/riscos/filetype.c @@ -72,26 +72,25 @@ const char *fetch_filetype(const char *unix_path) int objtype; if (!path) { - LOG(("Insufficient memory for calloc")); + LOG("Insufficient memory for calloc"); warn_user("NoMemory", 0); return "application/riscos"; } - LOG(("unix_path = '%s'", unix_path)); + LOG("unix_path = '%s'", unix_path); /* convert path to RISC OS format and read file type */ r = __riscosify(unix_path, 0, __RISCOSIFY_NO_SUFFIX, path, len, 0); if (r == 0) { - LOG(("__riscosify failed")); + LOG("__riscosify failed"); free(path); return "application/riscos"; } - LOG(("riscos path '%s'", path)); + LOG("riscos path '%s'", path); error = xosfile_read_stamped_no_path(path, &objtype, 0, 0, 0, 0, &file_type); if (error) { - LOG(("xosfile_read_stamped_no_path failed: %s", - error->errmess)); + LOG("xosfile_read_stamped_no_path failed: %s", error->errmess); free(path); return "application/riscos"; } @@ -110,9 +109,7 @@ const char *fetch_filetype(const char *unix_path) slash+1, &temp); if (error) /* ignore error and leave file_type alone */ - LOG(("xmimemaptranslate_extension_to_filetype: " - "0x%x %s", - error->errnum, error->errmess)); + LOG("xmimemaptranslate_extension_to_filetype: ""0x%x %s", error->errnum, error->errmess); else file_type = temp; } @@ -130,7 +127,7 @@ const char *fetch_filetype(const char *unix_path) /* not in internal table, so ask MimeMap */ error = xmimemaptranslate_filetype_to_mime_type(file_type, type_buf); if (error) { - LOG(("0x%x %s", error->errnum, error->errmess)); + LOG("0x%x %s", error->errnum, error->errmess); free(path); return "application/riscos"; } @@ -143,7 +140,7 @@ const char *fetch_filetype(const char *unix_path) free(path); - LOG(("mime type '%s'", type_buf)); + LOG("mime type '%s'", type_buf); return (const char *)type_buf; } @@ -159,15 +156,14 @@ char *fetch_mimetype(const char *ro_path) struct type_entry *t; if (!mime) { - LOG(("Insufficient memory for calloc")); + LOG("Insufficient memory for calloc"); warn_user("NoMemory", 0); return 0; } e = xosfile_read_no_path(ro_path, &objtype, &load, 0, 0, 0); if (e) { - LOG(("xosfile_read_no_path: 0x%x: %s", - e->errnum, e->errmess)); + LOG("xosfile_read_no_path: 0x%x: %s", e->errnum, e->errmess); free(mime); return 0; } @@ -193,7 +189,7 @@ char *fetch_mimetype(const char *ro_path) if (e) /* if we get an error here, simply ignore it and * leave filetype unchanged */ - LOG(("0x%x %s", e->errnum, e->errmess)); + LOG("0x%x %s", e->errnum, e->errmess); else filetype = load; } @@ -210,8 +206,7 @@ char *fetch_mimetype(const char *ro_path) /* not in internal table, so ask MimeMap */ e = xmimemaptranslate_filetype_to_mime_type(filetype, mime); if (e) { - LOG(("xmimemaptranslate_filetype_to_mime_type: 0x%x: %s", - e->errnum, e->errmess)); + LOG("xmimemaptranslate_filetype_to_mime_type: 0x%x: %s", e->errnum, e->errmess); free(mime); return 0; } @@ -328,7 +323,7 @@ bits ro_filetype_from_unix_path(const char *unix_path) bits file_type; if (!path) { - LOG(("Insufficient memory for calloc")); + LOG("Insufficient memory for calloc"); warn_user("NoMemory", 0); return osfile_TYPE_DATA; } @@ -336,7 +331,7 @@ bits ro_filetype_from_unix_path(const char *unix_path) /* convert path to RISC OS format and read file type */ r = __riscosify(unix_path, 0, __RISCOSIFY_NO_SUFFIX, path, len, 0); if (r == 0) { - LOG(("__riscosify failed")); + LOG("__riscosify failed"); free(path); return osfile_TYPE_DATA; } @@ -344,8 +339,7 @@ bits ro_filetype_from_unix_path(const char *unix_path) error = xosfile_read_stamped_no_path(path, 0, 0, 0, 0, 0, &file_type); if (error) { - LOG(("xosfile_read_stamped_no_path failed: %s", - error->errmess)); + LOG("xosfile_read_stamped_no_path failed: %s", error->errmess); free(path); return osfile_TYPE_DATA; } diff --git a/riscos/font.c b/riscos/font.c index db6376a88..7947365f9 100644 --- a/riscos/font.c +++ b/riscos/font.c @@ -79,19 +79,17 @@ void nsfont_init(void) nsfont_check_fonts(); - LOG(("Initialise RUfl")); + LOG("Initialise RUfl"); code = rufl_init(); if (code != rufl_OK) { if (code == rufl_FONT_MANAGER_ERROR) - LOG(("rufl_init: rufl_FONT_MANAGER_ERROR: 0x%x: %s", - rufl_fm_error->errnum, - rufl_fm_error->errmess)); + LOG("rufl_init: rufl_FONT_MANAGER_ERROR: 0x%x: %s", rufl_fm_error->errnum, rufl_fm_error->errmess); else - LOG(("rufl_init: 0x%x", code)); + LOG("rufl_init: 0x%x", code); die("The Unicode font library could not be initialized. " "Please report this to the developers."); } - LOG(("RUfl initialised")); + LOG("RUfl initialised"); if (rufl_family_list_entries == 0) die("No fonts could be found. At least one font must be " @@ -125,9 +123,9 @@ const char *nsfont_fallback_font(void) const char *fallback = "Homerton"; if (!nsfont_exists(fallback)) { - LOG(("Homerton not found, dumping RUfl family list")); + LOG("Homerton not found, dumping RUfl family list"); for (unsigned int i = 0; i < rufl_family_list_entries; i++) { - LOG(("'%s'", rufl_family_list[i])); + LOG("'%s'", rufl_family_list[i]); } fallback = rufl_family_list[0]; } @@ -203,8 +201,7 @@ void nsfont_check_fonts(void) "<NetSurf$Dir>.FixFonts", 0); die("FontBadInst"); } else { - LOG(("xfont_find_font: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xfont_find_font: 0x%x: %s", error->errnum, error->errmess); snprintf(s, sizeof s, messages_get("FontError"), error->errmess); die(s); @@ -213,8 +210,7 @@ void nsfont_check_fonts(void) error = xfont_lose_font(font); if (error) { - LOG(("xfont_lose_font: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xfont_lose_font: 0x%x: %s", error->errnum, error->errmess); snprintf(s, sizeof s, messages_get("FontError"), error->errmess); die(s); @@ -252,11 +248,9 @@ bool nsfont_width(const plot_font_style_t *fstyle, width); if (code != rufl_OK) { if (code == rufl_FONT_MANAGER_ERROR) - LOG(("rufl_width: rufl_FONT_MANAGER_ERROR: 0x%x: %s", - rufl_fm_error->errnum, - rufl_fm_error->errmess)); + LOG("rufl_width: rufl_FONT_MANAGER_ERROR: 0x%x: %s", rufl_fm_error->errnum, rufl_fm_error->errmess); else - LOG(("rufl_width: 0x%x", code)); + LOG("rufl_width: 0x%x", code); /* warn_user("MiscError", "font error"); */ *width = 0; return false; @@ -300,12 +294,9 @@ bool nsfont_position_in_string(const plot_font_style_t *fstyle, x * 2, char_offset, actual_x); if (code != rufl_OK) { if (code == rufl_FONT_MANAGER_ERROR) - LOG(("rufl_x_to_offset: rufl_FONT_MANAGER_ERROR: " - "0x%x: %s", - rufl_fm_error->errnum, - rufl_fm_error->errmess)); + LOG("rufl_x_to_offset: rufl_FONT_MANAGER_ERROR: ""0x%x: %s", rufl_fm_error->errnum, rufl_fm_error->errmess); else - LOG(("rufl_x_to_offset: 0x%x", code)); + LOG("rufl_x_to_offset: 0x%x", code); /* warn_user("MiscError", "font error"); */ *char_offset = 0; *actual_x = 0; @@ -361,12 +352,9 @@ bool nsfont_split(const plot_font_style_t *fstyle, x * 2, char_offset, actual_x); if (code != rufl_OK) { if (code == rufl_FONT_MANAGER_ERROR) - LOG(("rufl_split: rufl_FONT_MANAGER_ERROR: " - "0x%x: %s", - rufl_fm_error->errnum, - rufl_fm_error->errmess)); + LOG("rufl_split: rufl_FONT_MANAGER_ERROR: ""0x%x: %s", rufl_fm_error->errnum, rufl_fm_error->errmess); else - LOG(("rufl_split: 0x%x", code)); + LOG("rufl_split: 0x%x", code); /* warn_user("MiscError", "font error"); */ *char_offset = 0; *actual_x = 0; @@ -395,11 +383,9 @@ bool nsfont_split(const plot_font_style_t *fstyle, actual_x); if (code != rufl_OK) { if (code == rufl_FONT_MANAGER_ERROR) - LOG(("rufl_width: rufl_FONT_MANAGER_ERROR: 0x%x: %s", - rufl_fm_error->errnum, - rufl_fm_error->errmess)); + LOG("rufl_width: rufl_FONT_MANAGER_ERROR: 0x%x: %s", rufl_fm_error->errnum, rufl_fm_error->errmess); else - LOG(("rufl_width: 0x%x", code)); + LOG("rufl_width: 0x%x", code); /* warn_user("MiscError", "font error"); */ *char_offset = 0; *actual_x = 0; @@ -442,11 +428,9 @@ bool nsfont_paint(const plot_font_style_t *fstyle, const char *string, string, length, x, y, flags); if (code != rufl_OK) { if (code == rufl_FONT_MANAGER_ERROR) - LOG(("rufl_paint: rufl_FONT_MANAGER_ERROR: 0x%x: %s", - rufl_fm_error->errnum, - rufl_fm_error->errmess)); + LOG("rufl_paint: rufl_FONT_MANAGER_ERROR: 0x%x: %s", rufl_fm_error->errnum, rufl_fm_error->errmess); else - LOG(("rufl_paint: 0x%x", code)); + LOG("rufl_paint: 0x%x", code); } return true; @@ -539,8 +523,7 @@ void ro_gui_wimp_desktop_font(char *family, size_t family_size, int *psize, error = xwimpreadsysinfo_font(&font_handle, NULL); if (error) { - LOG(("xwimpreadsysinfo_font: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimpreadsysinfo_font: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); goto failsafe; } @@ -552,22 +535,20 @@ void ro_gui_wimp_desktop_font(char *family, size_t family_size, int *psize, error = xfont_read_identifier(font_handle, NULL, &used); if (error) { - LOG(("xfont_read_identifier: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xfont_read_identifier: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); goto failsafe; } if (family_size < (size_t) used + 1) { - LOG(("desktop font name too long")); + LOG("desktop font name too long"); goto failsafe; } error = xfont_read_defn(font_handle, (byte *) family, &ptx, &pty, NULL, NULL, NULL, NULL); if (error) { - LOG(("xfont_read_defn: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xfont_read_defn: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); goto failsafe; } @@ -579,7 +560,7 @@ void ro_gui_wimp_desktop_font(char *family, size_t family_size, int *psize, } } - LOG(("desktop font \"%s\"", family)); + LOG("desktop font \"%s\"", family); if (strcasestr(family, ".Medium")) style = rufl_WEIGHT_500; @@ -595,7 +576,7 @@ void ro_gui_wimp_desktop_font(char *family, size_t family_size, int *psize, *psize = max(ptx, pty); *pstyle = style; - LOG(("family \"%s\", size %i, style %i", family, *psize, style)); + LOG("family \"%s\", size %i, style %i", family, *psize, style); return; diff --git a/riscos/global_history.c b/riscos/global_history.c index 6482d1bba..7bbc53c2a 100644 --- a/riscos/global_history.c +++ b/riscos/global_history.c @@ -116,7 +116,7 @@ void ro_gui_global_history_postinitialise(void) &ro_global_history_treeview_callbacks, TREE_HISTORY); if (global_history_window.tv == NULL) { - LOG(("Failed to allocate treeview")); + LOG("Failed to allocate treeview"); return; } diff --git a/riscos/gui.c b/riscos/gui.c index 6a861c295..49292cf85 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -305,7 +305,7 @@ static nserror set_defaults(struct nsoption_s *defaults) if (nsoption_charp(ca_bundle) == NULL || nsoption_charp(cookie_file) == NULL || nsoption_charp(cookie_jar) == NULL) { - LOG(("Failed initialising string options")); + LOG("Failed initialising string options"); return NSERROR_BAD_PARAMETER; } @@ -417,7 +417,7 @@ static void ro_gui_signal(int sig) if (used) { int curr_slot; xwimp_slot_size(-1, -1, &curr_slot, 0, 0); - LOG(("saving WimpSlot, size 0x%x", curr_slot)); + LOG("saving WimpSlot, size 0x%x", curr_slot); xosfile_save("$.NetSurf_Slot", 0x8000, 0, (byte *) 0x8000, (byte *) 0x8000 + curr_slot); @@ -427,9 +427,7 @@ static void ro_gui_signal(int sig) byte *base_address; xosdynamicarea_read(__dynamic_num, &size, &base_address, 0, 0, 0, 0, 0); - LOG(("saving DA %i, base %p, size 0x%x", - __dynamic_num, - base_address, size)); + LOG("saving DA %i, base %p, size 0x%x", __dynamic_num, base_address, size); xosfile_save("$.NetSurf_DA", (bits) base_address, 0, base_address, @@ -441,7 +439,7 @@ static void ro_gui_signal(int sig) * defines a coredump directory. */ const _kernel_oserror *err = __unixlib_write_coredump (NULL); if (err != NULL) - LOG(("Coredump failed: %s", err->errmess)); + LOG("Coredump failed: %s", err->errmess); #endif xhourglass_colours(old_sand, old_glass, 0, 0); @@ -525,8 +523,7 @@ static char *ro_gui_uri_file_parse(const char *file_name, char **uri_title) *uri_title = NULL; fp = fopen(file_name, "rb"); if (!fp) { - LOG(("fopen(\"%s\", \"rb\"): %i: %s", - file_name, errno, strerror(errno))); + LOG("fopen(\"%s\", \"rb\"): %i: %s", file_name, errno, strerror(errno)); warn_user("LoadError", strerror(errno)); return 0; } @@ -587,16 +584,14 @@ static char *ro_gui_url_file_parse(const char *file_name) fp = fopen(file_name, "r"); if (!fp) { - LOG(("fopen(\"%s\", \"r\"): %i: %s", - file_name, errno, strerror(errno))); + LOG("fopen(\"%s\", \"r\"): %i: %s", file_name, errno, strerror(errno)); warn_user("LoadError", strerror(errno)); return 0; } if (!fgets(line, sizeof line, fp)) { if (ferror(fp)) { - LOG(("fgets: %i: %s", - errno, strerror(errno))); + LOG("fgets: %i: %s", errno, strerror(errno)); warn_user("LoadError", strerror(errno)); } else warn_user("LoadError", messages_get("EmptyError")); @@ -633,8 +628,7 @@ static char *ro_gui_ieurl_file_parse(const char *file_name) fp = fopen(file_name, "r"); if (!fp) { - LOG(("fopen(\"%s\", \"r\"): %i: %s", - file_name, errno, strerror(errno))); + LOG("fopen(\"%s\", \"r\"): %i: %s", file_name, errno, strerror(errno)); warn_user("LoadError", strerror(errno)); return 0; } @@ -653,8 +647,7 @@ static char *ro_gui_ieurl_file_parse(const char *file_name) } } if (ferror(fp)) { - LOG(("fgets: %i: %s", - errno, strerror(errno))); + LOG("fgets: %i: %s", errno, strerror(errno)); warn_user("LoadError", strerror(errno)); fclose(fp); return 0; @@ -726,8 +719,7 @@ static void ro_msg_dataopen(wimp_message *message) message->your_ref = message->my_ref; oserror = xwimp_send_message(wimp_USER_MESSAGE, message, message->sender); if (oserror) { - LOG(("xwimp_send_message: 0x%x: %s", - oserror->errnum, oserror->errmess)); + LOG("xwimp_send_message: 0x%x: %s", oserror->errnum, oserror->errmess); warn_user("WimpError", oserror->errmess); return; } @@ -850,8 +842,7 @@ static void ro_msg_dataload(wimp_message *message) oserror = xwimp_send_message(wimp_USER_MESSAGE, message, message->sender); if (oserror) { - LOG(("xwimp_send_message: 0x%x: %s", - oserror->errnum, oserror->errmess)); + LOG("xwimp_send_message: 0x%x: %s", oserror->errnum, oserror->errmess); warn_user("WimpError", oserror->errmess); return; } @@ -921,7 +912,7 @@ static void ro_msg_datasave(wimp_message *message) error = xwimp_send_message(wimp_USER_MESSAGE, (wimp_message*)dataxfer, message->sender); if (error) { - LOG(("xwimp_send_message: 0x%x: %s", error->errnum, error->errmess)); + LOG("xwimp_send_message: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -973,7 +964,7 @@ static void ro_msg_prequit(wimp_message *message) error = xwimp_send_message(wimp_USER_MESSAGE_ACKNOWLEDGE, message, message->sender); if (error) { - LOG(("xwimp_send_message: 0x%x:%s", error->errnum, error->errmess)); + LOG("xwimp_send_message: 0x%x:%s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -999,7 +990,7 @@ static void ro_msg_save_desktop(wimp_message *message) } if (error) { - LOG(("xosgbpb_writew/xos_bputw: 0x%x:%s", error->errnum, error->errmess)); + LOG("xosgbpb_writew/xos_bputw: 0x%x:%s", error->errnum, error->errmess); warn_user("SaveError", error->errmess); /* we must cancel the save by acknowledging the message */ @@ -1007,7 +998,7 @@ static void ro_msg_save_desktop(wimp_message *message) error = xwimp_send_message(wimp_USER_MESSAGE_ACKNOWLEDGE, message, message->sender); if (error) { - LOG(("xwimp_send_message: 0x%x:%s", error->errnum, error->errmess)); + LOG("xwimp_send_message: 0x%x:%s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -1058,8 +1049,7 @@ static void ro_gui_get_screen_properties(void) error = xos_read_vdu_variables(PTR_OS_VDU_VAR_LIST(&vars), vals); if (error) { - LOG(("xos_read_vdu_variables: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xos_read_vdu_variables: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); return; } @@ -1076,9 +1066,9 @@ static void ro_gui_check_resolvers(void) char *resolvers; resolvers = getenv("Inet$Resolvers"); if (resolvers && resolvers[0]) { - LOG(("Inet$Resolvers '%s'", resolvers)); + LOG("Inet$Resolvers '%s'", resolvers); } else { - LOG(("Inet$Resolvers not set or empty")); + LOG("Inet$Resolvers not set or empty"); warn_user("Resolvers", 0); } } @@ -1183,8 +1173,7 @@ static nserror gui_init(int argc, char** argv) PTR_WIMP_MESSAGE_LIST(&task_messages), 0, &task_handle); if (error) { - LOG(("xwimp_initialise: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_initialise: 0x%x: %s", error->errnum, error->errmess); die(error->errmess); } /* Register message handlers */ @@ -1225,8 +1214,7 @@ static nserror gui_init(int argc, char** argv) die("Failed to locate Templates resource."); error = xwimp_open_template(path); if (error) { - LOG(("xwimp_open_template failed: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_template failed: 0x%x: %s", error->errnum, error->errmess); die(error->errmess); } @@ -1287,7 +1275,7 @@ static nserror gui_init(int argc, char** argv) /* parse command-line arguments */ if (argc == 2) { - LOG(("parameters: '%s'", argv[1])); + LOG("parameters: '%s'", argv[1]); /* this is needed for launching URI files */ if (strcasecmp(argv[1], "-nowin") == 0) { return NSERROR_OK; @@ -1295,7 +1283,7 @@ static nserror gui_init(int argc, char** argv) ret = nsurl_create(NETSURF_HOMEPAGE, &url); } else if (argc == 3) { - LOG(("parameters: '%s' '%s'", argv[1], argv[2])); + LOG("parameters: '%s' '%s'", argv[1], argv[2]); open_window = true; /* HTML files */ @@ -1306,7 +1294,7 @@ static nserror gui_init(int argc, char** argv) else if (strcasecmp(argv[1], "-urlf") == 0) { char *urlf = ro_gui_url_file_parse(argv[2]); if (!urlf) { - LOG(("allocation failed")); + LOG("allocation failed"); die("Insufficient memory for URL"); } ret = nsurl_create(urlf, &url); @@ -1318,8 +1306,7 @@ static nserror gui_init(int argc, char** argv) } /* Unknown => exit here. */ else { - LOG(("Unknown parameters: '%s' '%s'", - argv[1], argv[2])); + LOG("Unknown parameters: '%s' '%s'", argv[1], argv[2]); return NSERROR_BAD_PARAMETER; } } @@ -1367,8 +1354,7 @@ const char *ro_gui_default_language(void) /* choose a language from the configured country number */ error = xosbyte_read(osbyte_VAR_COUNTRY_NUMBER, &country); if (error) { - LOG(("xosbyte_read failed: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosbyte_read failed: 0x%x: %s", error->errnum, error->errmess); country = 1; } switch (country) { @@ -1419,8 +1405,7 @@ static nserror ro_path_to_nsurl(const char *path, struct nsurl **url_out) /* calculate the canonical risc os path */ error = xosfscontrol_canonicalise_path(path, 0, 0, 0, 0, &spare); if (error) { - LOG(("xosfscontrol_canonicalise_path failed: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfscontrol_canonicalise_path failed: 0x%x: %s", error->errnum, error->errmess); warn_user("PathToURL", error->errmess); return NSERROR_NOT_FOUND; } @@ -1433,8 +1418,7 @@ static nserror ro_path_to_nsurl(const char *path, struct nsurl **url_out) error = xosfscontrol_canonicalise_path(path, canonical_path, 0, 0, 1 - spare, 0); if (error) { - LOG(("xosfscontrol_canonicalise_path failed: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfscontrol_canonicalise_path failed: 0x%x: %s", error->errnum, error->errmess); warn_user("PathToURL", error->errmess); free(canonical_path); return NSERROR_NOT_FOUND; @@ -1444,7 +1428,7 @@ static nserror ro_path_to_nsurl(const char *path, struct nsurl **url_out) unix_path = __unixify(canonical_path, __RISCOSIFY_NO_REVERSE_SUFFIX, NULL, 0, 0); if (unix_path == NULL) { - LOG(("__unixify failed: %s", canonical_path)); + LOG("__unixify failed: %s", canonical_path); free(canonical_path); return NSERROR_BAD_PARAMETER; } @@ -1454,7 +1438,7 @@ static nserror ro_path_to_nsurl(const char *path, struct nsurl **url_out) urllen = strlen(unix_path) + FILE_SCHEME_PREFIX_LEN + 1; url = malloc(urllen); if (url == NULL) { - LOG(("Unable to allocate url")); + LOG("Unable to allocate url"); free(unix_path); return NSERROR_NOMEM; } @@ -1604,8 +1588,7 @@ static void ro_gui_keypress_cb(void *pw) if (ro_gui_wimp_event_keypress(key) == false) { os_error *error = xwimp_process_key(key->c); if (error) { - LOG(("xwimp_process_key: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_process_key: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -1642,8 +1625,7 @@ static void ro_gui_keypress(wimp_key *key) } else if (ro_gui_wimp_event_keypress(key) == false) { os_error *error = xwimp_process_key(key->c); if (error) { - LOG(("xwimp_process_key: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_process_key: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -1915,8 +1897,7 @@ void ro_gui_open_window_request(wimp_open *open) error = xwimp_open_window(open); if (error) { - LOG(("xwimp_open_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1937,8 +1918,7 @@ static void ro_gui_view_source_bounce(wimp_message *message) sprintf(command, "@RunType_FFF %s", filename); error = xwimp_start_task(command, 0); if (error) { - LOG(("xwimp_start_task failed: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_start_task failed: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -2001,7 +1981,7 @@ void ro_gui_view_source(hlcache_handle *c) r = __riscosify(full_name, 0, __RISCOSIFY_NO_SUFFIX, message.file_name, 212, 0); if (r == 0) { - LOG(("__riscosify failed")); + LOG("__riscosify failed"); return; } message.file_name[211] = '\0'; @@ -2011,8 +1991,7 @@ void ro_gui_view_source(hlcache_handle *c) (byte *) source_data, (byte *) source_data + source_size); if (error) { - LOG(("xosfile_save_stamped failed: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_save_stamped failed: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); return; } @@ -2082,7 +2061,7 @@ static void ro_gui_choose_language(void) */ void warn_user(const char *warning, const char *detail) { - LOG(("%s %s", warning, detail)); + LOG("%s %s", warning, detail); if (dialog_warning) { char warn_buffer[300]; @@ -2125,7 +2104,7 @@ void die(const char * const error) { os_error warn_error; - LOG(("%s", error)); + LOG("%s", error); warn_error.errnum = 1; /* \todo: reasonable ? */ strncpy(warn_error.errmess, messages_get(error), @@ -2362,7 +2341,7 @@ void ro_gui_dump_browser_window(struct browser_window *bw) /* open file for dump */ FILE *stream = fopen("<Wimp$ScrapDir>.WWW.NetSurf.dump", "w"); if (!stream) { - LOG(("fopen: errno %i", errno)); + LOG("fopen: errno %i", errno); warn_user("SaveError", strerror(errno)); return; } @@ -2375,8 +2354,7 @@ void ro_gui_dump_browser_window(struct browser_window *bw) error = xwimp_start_task("Filer_Run <Wimp$ScrapDir>.WWW.NetSurf.dump", 0); if (error) { - LOG(("xwimp_start_task failed: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_start_task failed: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -2415,7 +2393,7 @@ static char *get_cachepath(void) cachedir = getenv("Cache$Dir"); if ((cachedir == NULL) || (cachedir[0] == 0)) { - LOG(("cachedir was null")); + LOG("cachedir was null"); return NULL; } ret = netsurf_mkpath(&cachepath, NULL, 2, cachedir, "NetSurf"); diff --git a/riscos/gui/button_bar.c b/riscos/gui/button_bar.c index d92433d0b..e04bfc270 100644 --- a/riscos/gui/button_bar.c +++ b/riscos/gui/button_bar.c @@ -139,7 +139,7 @@ struct button_bar *ro_gui_button_bar_create(struct theme_descriptor *theme, button_bar = malloc(sizeof(struct button_bar)); if (button_bar == NULL) { - LOG(("No memory for malloc()")); + LOG("No memory for malloc()"); return NULL; } @@ -539,8 +539,7 @@ bool ro_gui_button_bar_icon_update(struct button_bar *button_bar) error = xwimp_create_icon(&icon, &button->icon); if (error) { - LOG(("xwimp_create_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); button->icon = -1; return false; @@ -550,8 +549,7 @@ bool ro_gui_button_bar_icon_update(struct button_bar *button_bar) error = xwimp_delete_icon(button_bar->window, button->icon); if (error != NULL) { - LOG(("xwimp_delete_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_delete_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -601,8 +599,7 @@ bool ro_gui_button_bar_icon_resize(struct button_bar *button_bar) button->y_pos + button->y_size); if (error != NULL) { - LOG(("xwimp_resize_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); button->icon = -1; return false; @@ -773,8 +770,7 @@ bool ro_gui_button_bar_click(struct button_bar *button_bar, button_bar->sprites, sprite, &box, NULL); if (error) - LOG(("xdragasprite_start: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xdragasprite_start: 0x%x: %s", error->errnum, error->errmess); ro_mouse_drag_start(ro_gui_button_bar_drag_end, NULL, NULL, NULL); @@ -875,8 +871,7 @@ void ro_gui_button_bar_drag_end(wimp_dragged *drag, void *data) error = xwimp_get_pointer_info(&pointer); if (error) { - LOG(("xwimp_get_pointer_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_pointer_info: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -886,8 +881,7 @@ void ro_gui_button_bar_drag_end(wimp_dragged *drag, void *data) state.w = drag_start->window; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1075,7 +1069,7 @@ char *ro_gui_button_bar_get_config(struct button_bar *button_bar) config = malloc(size); if (config == NULL) { - LOG(("No memory for malloc()")); + LOG("No memory for malloc()"); warn_user("NoMemory", 0); return NULL; } diff --git a/riscos/gui/progress_bar.c b/riscos/gui/progress_bar.c index 09b3edb45..3ec6b3aa8 100644 --- a/riscos/gui/progress_bar.c +++ b/riscos/gui/progress_bar.c @@ -137,8 +137,7 @@ struct progress_bar *ro_gui_progress_bar_create(void) error = xwimp_create_window((wimp_window *)&progress_bar_definition, &pb->w); if (error) { - LOG(("xwimp_create_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_window: 0x%x: %s", error->errnum, error->errmess); free(pb); return NULL; } @@ -166,8 +165,7 @@ void ro_gui_progress_bar_destroy(struct progress_bar *pb) ro_gui_wimp_event_finalise(pb->w); error = xwimp_delete_window(pb->w); if (error) { - LOG(("xwimp_delete_window: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xwimp_delete_window: 0x%x:%s", error->errnum, error->errmess); } free(pb); @@ -329,8 +327,7 @@ void ro_gui_progress_bar_update(struct progress_bar *pb, int width, int height) redraw.box.x0 = cur.x1; error = xwimp_update_window(&redraw, &more); if (error) { - LOG(("Error getting update window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("Error getting update window: 0x%x: %s", error->errnum, error->errmess); return; } if (more) @@ -354,8 +351,7 @@ void ro_gui_progress_bar_redraw(wimp_draw *redraw) error = xwimp_redraw_window(redraw, &more); if (error) { - LOG(("xwimp_redraw_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_redraw_window: 0x%x: %s", error->errnum, error->errmess); return; } if (more) @@ -389,7 +385,7 @@ void ro_gui_progress_bar_animate(void *p) redraw.box = pb->visible; error = xwimp_update_window(&redraw, &more); if (error != NULL) { - LOG(("Error getting update window: '%s'", error->errmess)); + LOG("Error getting update window: '%s'", error->errmess); return; } if (more) @@ -532,8 +528,7 @@ void ro_gui_progress_bar_redraw_window(wimp_draw *redraw, } error = xwimp_get_rectangle(redraw, &more); if (error) { - LOG(("xwimp_get_rectangle: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_rectangle: 0x%x: %s", error->errnum, error->errmess); return; } } diff --git a/riscos/gui/status_bar.c b/riscos/gui/status_bar.c index e7dc54279..cbc404658 100644 --- a/riscos/gui/status_bar.c +++ b/riscos/gui/status_bar.c @@ -130,8 +130,7 @@ struct status_bar *ro_gui_status_bar_create(wimp_w parent, unsigned int width) error = xwimp_create_window((wimp_window *)&status_bar_definition, &sb->w); if (error) { - LOG(("xwimp_create_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_window: 0x%x: %s", error->errnum, error->errmess); free(sb); return NULL; } @@ -165,8 +164,7 @@ void ro_gui_status_bar_destroy(struct status_bar *sb) ro_gui_wimp_event_finalise(sb->w); error = xwimp_delete_window(sb->w); if (error) { - LOG(("xwimp_delete_window: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xwimp_delete_window: 0x%x:%s", error->errnum, error->errmess); } ro_gui_progress_bar_destroy(sb->pb); @@ -223,8 +221,7 @@ void ro_gui_status_bar_set_visible(struct status_bar *sb, bool visible) } else { os_error *error = xwimp_close_window(sb->w); if (error) { - LOG(("xwimp_close_window: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xwimp_close_window: 0x%x:%s", error->errnum, error->errmess); } } } @@ -277,15 +274,14 @@ void ro_gui_status_bar_set_progress_range(struct status_bar *sb, old_range = ro_gui_progress_bar_get_range(sb->pb); ro_gui_progress_bar_set_range(sb->pb, range); - LOG(("Ranges are %i vs %i", old_range, range)); + LOG("Ranges are %i vs %i", old_range, range); if ((old_range == 0) && (range != 0)) { ro_gui_status_position_progress_bar(sb); } else if ((old_range != 0) && (range == 0)) { os_error *error = xwimp_close_window( ro_gui_progress_bar_get_window(sb->pb)); if (error) { - LOG(("xwimp_close_window: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xwimp_close_window: 0x%x:%s", error->errnum, error->errmess); } } } @@ -357,8 +353,7 @@ void ro_gui_status_bar_resize(struct status_bar *sb) state.w = sb->parent; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); return; } window_width = state.visible.x1 - state.visible.x0; @@ -381,8 +376,7 @@ void ro_gui_status_bar_resize(struct status_bar *sb) extent.y1 = status_height - 4; error = xwimp_set_extent(sb->w, &extent); if (error) { - LOG(("xwimp_set_extent: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_extent: 0x%x: %s", error->errnum, error->errmess); return; } @@ -410,8 +404,7 @@ void ro_gui_status_bar_resize(struct status_bar *sb) wimp_CHILD_LINKS_PARENT_VISIBLE_BOTTOM_OR_LEFT << wimp_CHILD_TS_EDGE_SHIFT); if (error) { - LOG(("xwimp_open_window_nested: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window_nested: 0x%x: %s", error->errnum, error->errmess); return; } ro_gui_status_position_progress_bar(sb); @@ -419,8 +412,7 @@ void ro_gui_status_bar_resize(struct status_bar *sb) status_width - WIDGET_WIDTH, 0, status_width, status_height - 4); if (error) { - LOG(("xwimp_resize_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess); return; } @@ -455,8 +447,7 @@ void ro_gui_status_bar_redraw(wimp_draw *redraw) /* redraw the window */ error = xwimp_redraw_window(redraw, &more); if (error) { - LOG(("xwimp_redraw_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_redraw_window: 0x%x: %s", error->errnum, error->errmess); return; } while (more) { @@ -465,8 +456,7 @@ void ro_gui_status_bar_redraw(wimp_draw *redraw) error = xcolourtrans_set_font_colours(font_CURRENT, 0xeeeeee00, 0x00000000, 14, 0, 0, 0); if (error) { - LOG(("xcolourtrans_set_font_colours: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xcolourtrans_set_font_colours: 0x%x: %s", error->errnum, error->errmess); return; } code = rufl_paint(ro_gui_desktop_font_family, @@ -477,11 +467,9 @@ void ro_gui_status_bar_redraw(wimp_draw *redraw) rufl_BLEND_FONT); if (code != rufl_OK) { if (code == rufl_FONT_MANAGER_ERROR) - LOG(("rufl_FONT_MANAGER_ERROR: 0x%x: %s", - rufl_fm_error->errnum, - rufl_fm_error->errmess)); + LOG("rufl_FONT_MANAGER_ERROR: 0x%x: %s", rufl_fm_error->errnum, rufl_fm_error->errmess); else - LOG(("rufl_paint: 0x%x", code)); + LOG("rufl_paint: 0x%x", code); } } @@ -494,8 +482,7 @@ void ro_gui_status_bar_redraw(wimp_draw *redraw) error = xwimp_get_rectangle(redraw, &more); if (error) { - LOG(("xwimp_get_rectangle: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_rectangle: 0x%x: %s", error->errnum, error->errmess); return; } } @@ -534,8 +521,7 @@ bool ro_gui_status_bar_click(wimp_pointer *pointer) drag.initial.y1 = pointer->pos.y; error = xwimp_drag_box(&drag); if (error) { - LOG(("xwimp_drag_box: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_drag_box: 0x%x: %s", error->errnum, error->errmess); } break; } @@ -560,8 +546,7 @@ void ro_gui_status_bar_open(wimp_open *open) state.w = sb->parent; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); return; } window_width = state.visible.x1 - state.visible.x0; @@ -600,8 +585,7 @@ void ro_gui_status_position_progress_bar(struct status_bar *sb) state.w = sb->w; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); return; } @@ -631,8 +615,7 @@ void ro_gui_status_position_progress_bar(struct status_bar *sb) wimp_CHILD_LINKS_PARENT_VISIBLE_BOTTOM_OR_LEFT << wimp_CHILD_TS_EDGE_SHIFT); if (error) { - LOG(("xwimp_open_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess); } /* update the progress bar display on non-standard width */ diff --git a/riscos/gui/throbber.c b/riscos/gui/throbber.c index 5e2c87678..2eabb3e7e 100644 --- a/riscos/gui/throbber.c +++ b/riscos/gui/throbber.c @@ -79,7 +79,7 @@ struct throbber *ro_gui_throbber_create(struct theme_descriptor *theme) throbber = malloc(sizeof(struct throbber)); if (throbber == NULL) { - LOG(("No memory for malloc()")); + LOG("No memory for malloc()"); return NULL; } @@ -246,8 +246,7 @@ bool ro_gui_throbber_icon_update(struct throbber *throbber) error = xwimp_create_icon(&icon, &throbber->icon); if (error != NULL) { - LOG(("xwimp_create_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); throbber->icon = -1; return false; @@ -258,8 +257,7 @@ bool ro_gui_throbber_icon_update(struct throbber *throbber) } else if (throbber->hidden && throbber->icon != -1) { error = xwimp_delete_icon(throbber->window, throbber->icon); if (error != NULL) { - LOG(("xwimp_delete_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_delete_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -295,8 +293,7 @@ bool ro_gui_throbber_icon_resize(struct throbber *throbber) throbber->extent.x0, throbber->extent.y0, throbber->extent.x1, throbber->extent.y1); if (error != NULL) { - LOG(("xwimp_resize_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); throbber->icon = -1; return false; diff --git a/riscos/gui/url_bar.c b/riscos/gui/url_bar.c index 29eddedca..5eccd602e 100644 --- a/riscos/gui/url_bar.c +++ b/riscos/gui/url_bar.c @@ -133,7 +133,7 @@ struct url_bar *ro_gui_url_bar_create(struct theme_descriptor *theme) url_bar = malloc(sizeof(struct url_bar)); if (url_bar == NULL) { - LOG(("No memory for malloc()")); + LOG("No memory for malloc()"); return NULL; } @@ -228,8 +228,7 @@ static bool ro_gui_url_bar_icon_resize(struct url_bar *url_bar, bool full) url_bar->container_icon, x0, y0, x1, y1); if (error != NULL) { - LOG(("xwimp_resize_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); url_bar->container_icon = -1; return false; @@ -249,8 +248,7 @@ static bool ro_gui_url_bar_icon_resize(struct url_bar *url_bar, bool full) url_bar->suggest_icon, x0, y0, x1, y1); if (error != NULL) { - LOG(("xwimp_resize_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); url_bar->suggest_icon = -1; return false; @@ -271,8 +269,7 @@ static bool ro_gui_url_bar_icon_resize(struct url_bar *url_bar, bool full) url_bar->text_icon, x0, y0, x1, y1); if (error != NULL) { - LOG(("xwimp_resize_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); url_bar->text_icon = -1; return false; @@ -353,8 +350,7 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) wimp_ICON_BUTTON_TYPE_SHIFT); error = xwimp_create_icon(&icon, &url_bar->container_icon); if (error != NULL) { - LOG(("xwimp_create_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); url_bar->container_icon = -1; return false; @@ -365,8 +361,7 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) error = xwimp_delete_icon(url_bar->window, url_bar->container_icon); if (error != NULL) { - LOG(("xwimp_delete_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_delete_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -392,8 +387,7 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) wimp_ICON_BUTTON_TYPE_SHIFT); error = xwimp_create_icon(&icon, &url_bar->text_icon); if (error) { - LOG(("xwimp_create_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); url_bar->text_icon = -1; return false; @@ -404,8 +398,7 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) error = xwimp_delete_icon(url_bar->window, url_bar->text_icon); if (error != NULL) { - LOG(("xwimp_delete_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_delete_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -425,8 +418,7 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) wimp_ICON_BUTTON_TYPE_SHIFT); error = xwimp_create_icon(&icon, &url_bar->suggest_icon); if (error) { - LOG(("xwimp_create_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -446,8 +438,7 @@ static bool ro_gui_url_bar_icon_update(struct url_bar *url_bar) error = xwimp_delete_icon(url_bar->window, url_bar->suggest_icon); if (error != NULL) { - LOG(("xwimp_delete_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_delete_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -931,8 +922,7 @@ bool ro_gui_url_bar_take_caret(struct url_bar *url_bar) error = xwimp_set_caret_position(url_bar->window, url_bar->text_icon, -1, -1, -1, 0); if (error) { - LOG(("xwimp_set_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; @@ -969,7 +959,7 @@ void ro_gui_url_bar_set_url(struct url_bar *url_bar, const char *url, if (err != NSERROR_OK) { /* A bad encoding should never happen, so assert this */ assert(err != NSERROR_BAD_ENCODING); - LOG(("utf8_to_enc failed")); + LOG("utf8_to_enc failed"); /* Paranoia */ local_text = NULL; } @@ -986,7 +976,7 @@ void ro_gui_url_bar_set_url(struct url_bar *url_bar, const char *url, strncpy(url_bar->text_buffer, "", url_bar->text_size - 1); url_bar->text_buffer[url_bar->text_size - 1] = '\0'; warn_user("LongURL", NULL); - LOG(("Long URL (%d chars): %s", strlen(url), url)); + LOG("Long URL (%d chars): %s", strlen(url), url); } else { strncpy(url_bar->text_buffer, local_url, url_bar->text_size - 1); @@ -1014,8 +1004,7 @@ void ro_gui_url_bar_set_url(struct url_bar *url_bar, const char *url, error = xwimp_get_caret_position(&caret); if (error) { - LOG(("xwimp_get_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1028,8 +1017,7 @@ void ro_gui_url_bar_set_url(struct url_bar *url_bar, const char *url, error = xwimp_set_caret_position(url_bar->window, url_bar->text_icon, 0, 0, -1, strlen(set_url)); if (error) { - LOG(("xwimp_set_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -1106,8 +1094,7 @@ bool ro_gui_url_bar_get_url_extent(struct url_bar *url_bar, os_box *extent) state.i = url_bar->container_icon; error = xwimp_get_icon_state(&state); if (error) { - LOG(("xwimp_get_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } diff --git a/riscos/help.c b/riscos/help.c index 76d75db9f..c54af1ded 100644 --- a/riscos/help.c +++ b/riscos/help.c @@ -167,8 +167,7 @@ void ro_gui_interactive_help_request(wimp_message *message) error = xwimp_get_menu_state(wimp_GIVEN_WINDOW_AND_ICON, &menu_tree, window, icon); if (error) { - LOG(("xwimp_get_menu_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_menu_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -271,8 +270,7 @@ static void ro_gui_interactive_help_broadcast(wimp_message *message, error = xwimp_send_message(wimp_USER_MESSAGE, (wimp_message *)reply, reply->sender); if (error) { - LOG(("xwimp_send_message: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_send_message: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -300,8 +298,7 @@ bool ro_gui_interactive_help_available(void) error = xtaskmanager_enumerate_tasks(context, &task, sizeof(taskmanager_task), &context, 0); if (error) { - LOG(("xtaskmanager_enumerate_tasks: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xtaskmanager_enumerate_tasks: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); } @@ -338,8 +335,7 @@ void ro_gui_interactive_help_start(void) if ((help_start) && (help_start[0])) { error = xwimp_start_task("<Help$Start>", &task); if (error) { - LOG(("xwimp_start_tast: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_start_tast: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -349,8 +345,7 @@ void ro_gui_interactive_help_start(void) if (!task) { error = xwimp_start_task("Resources:$.Apps.!Help", &task); if (error) { - LOG(("xwimp_start_tast: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_start_tast: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -360,8 +355,7 @@ void ro_gui_interactive_help_start(void) if (task) { error = xos_read_monotonic_time(&help_time); if (error) { - LOG(("xwimp_read_monotonic_time: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_read_monotonic_time: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } diff --git a/riscos/history.c b/riscos/history.c index 3b8b63ae1..3dc9f0d7d 100644 --- a/riscos/history.c +++ b/riscos/history.c @@ -100,8 +100,7 @@ void ro_gui_history_open(struct gui_window *g, bool at_pointer) box.y0 = -height; error = xwimp_set_extent(history_window, &box); if (error) { - LOG(("xwimp_set_extent: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_extent: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -110,8 +109,7 @@ void ro_gui_history_open(struct gui_window *g, bool at_pointer) state.w = history_window; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -122,8 +120,7 @@ void ro_gui_history_open(struct gui_window *g, bool at_pointer) state.next = wimp_HIDDEN; error = xwimp_open_window(PTR_WIMP_OPEN(&state)); if (error) { - LOG(("xwimp_open_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -148,8 +145,7 @@ void ro_gui_history_redraw(wimp_draw *redraw) error = xwimp_redraw_window(redraw, &more); if (error) { - LOG(("xwimp_redraw_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_redraw_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -159,8 +155,7 @@ void ro_gui_history_redraw(wimp_draw *redraw) browser_window_history_redraw(history_bw, &ctx); error = xwimp_get_rectangle(redraw, &more); if (error) { - LOG(("xwimp_get_rectangle: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_rectangle: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -209,7 +204,7 @@ void ro_gui_history_mouse_at(wimp_pointer *pointer, void *data) os_box box = {0, 0, 0, 0}; os_error *error; - LOG(("Mouse at...")); + LOG("Mouse at..."); /* If the mouse hasn't moved, or if we don't want tooltips, exit */ if ((mouse_x == pointer->pos.x && mouse_y == pointer->pos.y) || @@ -224,8 +219,7 @@ void ro_gui_history_mouse_at(wimp_pointer *pointer, void *data) state.w = history_window; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -237,8 +231,7 @@ void ro_gui_history_mouse_at(wimp_pointer *pointer, void *data) /* not over a tree entry => close tooltip window. */ error = xwimp_close_window(dialog_tooltip); if (error) { - LOG(("xwimp_close_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_close_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -250,8 +243,7 @@ void ro_gui_history_mouse_at(wimp_pointer *pointer, void *data) strlen(url) > 256 ? 256 : strlen(url), &width); if (error) { - LOG(("xwimptextop_string_width: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimptextop_string_width: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -263,8 +255,7 @@ void ro_gui_history_mouse_at(wimp_pointer *pointer, void *data) ic.i = 0; error = xwimp_get_icon_state(&ic); if (error) { - LOG(("xwimp_get_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -272,8 +263,7 @@ void ro_gui_history_mouse_at(wimp_pointer *pointer, void *data) ic.icon.extent.x0, ic.icon.extent.y0, width + 16, ic.icon.extent.y1); if (error) { - LOG(("xwimp_resize_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_resize_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -281,8 +271,7 @@ void ro_gui_history_mouse_at(wimp_pointer *pointer, void *data) state.w = dialog_tooltip; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -292,8 +281,7 @@ void ro_gui_history_mouse_at(wimp_pointer *pointer, void *data) box.y0 = -36; error = xwimp_set_extent(dialog_tooltip, &box); if (error) { - LOG(("xwimp_set_extent: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_extent: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -307,8 +295,7 @@ void ro_gui_history_mouse_at(wimp_pointer *pointer, void *data) /* open window */ error = xwimp_open_window(PTR_WIMP_OPEN(&state)); if (error) { - LOG(("xwimp_open_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -335,8 +322,7 @@ bool ro_gui_history_click(wimp_pointer *pointer) state.w = history_window; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return true; } diff --git a/riscos/hotlist.c b/riscos/hotlist.c index 38df65ef7..0ddc3c858 100644 --- a/riscos/hotlist.c +++ b/riscos/hotlist.c @@ -150,7 +150,7 @@ void ro_gui_hotlist_postinitialise(void) hotlist_window.toolbar, &ro_hotlist_treeview_callbacks, TREE_HOTLIST); if (hotlist_window.tv == NULL) { - LOG(("Failed to allocate treeview")); + LOG("Failed to allocate treeview"); return; } @@ -233,7 +233,7 @@ void ro_gui_hotlist_open(void) if (error == NULL) return; - LOG(("xos_cli: 0x%x: %s", error->errnum, error->errmess)); + LOG("xos_cli: 0x%x: %s", error->errnum, error->errmess); warn_user("Failed to launch external hotlist: %s", error->errmess); } diff --git a/riscos/iconbar.c b/riscos/iconbar.c index 23df24c3d..7b7bb250e 100644 --- a/riscos/iconbar.c +++ b/riscos/iconbar.c @@ -95,8 +95,7 @@ void ro_gui_iconbar_initialise(void) { "!netsurf" } } }; error = xwimp_create_icon(&icon, 0); if (error) { - LOG(("xwimp_create_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess); die(error->errmess); } @@ -238,7 +237,7 @@ bool ro_gui_iconbar_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, return true; case APPLICATION_QUIT: if (ro_gui_prequit()) { - LOG(("QUIT in response to user request")); + LOG("QUIT in response to user request"); riscos_done = true; } return true; diff --git a/riscos/image.c b/riscos/image.c index 18ad4859e..63e65f27b 100644 --- a/riscos/image.c +++ b/riscos/image.c @@ -142,8 +142,7 @@ bool image_redraw_tinct(osspriteop_id header, int x, int y, } if (error) { - LOG(("xtinct_plotscaled%s: 0x%x: %s", (alpha ? "alpha" : ""), - error->errnum, error->errmess)); + LOG("xtinct_plotscaled%s: 0x%x: %s", (alpha ? "alpha" : ""), error->errnum, error->errmess); return false; } @@ -177,14 +176,13 @@ bool image_redraw_os(osspriteop_id header, int x, int y, int req_width, colourtrans_CURRENT_PALETTE, 0, colourtrans_GIVEN_SPRITE, 0, 0, &size); if (error) { - LOG(("xcolourtrans_generate_table_for_sprite: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xcolourtrans_generate_table_for_sprite: 0x%x: %s", error->errnum, error->errmess); return false; } table = calloc(size, sizeof(char)); if (!table) { - LOG(("malloc failed")); + LOG("malloc failed"); warn_user("NoMemory", 0); return false; } @@ -195,8 +193,7 @@ bool image_redraw_os(osspriteop_id header, int x, int y, int req_width, colourtrans_CURRENT_PALETTE, table, colourtrans_GIVEN_SPRITE, 0, 0, 0); if (error) { - LOG(("xcolourtrans_generate_table_for_sprite: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xcolourtrans_generate_table_for_sprite: 0x%x: %s", error->errnum, error->errmess); free(table); return false; } @@ -211,8 +208,7 @@ bool image_redraw_os(osspriteop_id header, int x, int y, int req_width, x, (int)(y - req_height), 8, &f, table); if (error) { - LOG(("xosspriteop_put_sprite_scaled: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosspriteop_put_sprite_scaled: 0x%x: %s", error->errnum, error->errmess); free(table); return false; } diff --git a/riscos/menus.c b/riscos/menus.c index a7926ff70..b803f8cf8 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -238,8 +238,7 @@ void ro_gui_menu_create(wimp_menu *menu, int x, int y, wimp_w w) current_menu_open = true; error = xwimp_create_menu(menu, x - 64, y); if (error) { - LOG(("xwimp_create_menu: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_menu: 0x%x: %s", error->errnum, error->errmess); warn_user("MenuError", error->errmess); ro_gui_menu_closed(); } @@ -265,16 +264,14 @@ void ro_gui_popup_menu(wimp_menu *menu, wimp_w w, wimp_i i) icon_state.i = i; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("MenuError", error->errmess); return; } error = xwimp_get_icon_state(&icon_state); if (error) { - LOG(("xwimp_get_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("MenuError", error->errmess); return; } @@ -300,8 +297,7 @@ void ro_gui_menu_destroy(void) error = xwimp_create_menu(wimp_CLOSE_MENU, 0, 0); if (error) { - LOG(("xwimp_create_menu: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_menu: 0x%x: %s", error->errnum, error->errmess); warn_user("MenuError", error->errmess); } @@ -364,8 +360,7 @@ void ro_gui_menu_selection(wimp_selection *selection) /* re-open the menu for Adjust clicks */ error = xwimp_get_pointer_info(&pointer); if (error) { - LOG(("xwimp_get_pointer_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_pointer_info: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); ro_gui_menu_closed(); return; @@ -431,8 +426,7 @@ void ro_gui_menu_warning(wimp_message_menu_warning *warning) error = xwimp_create_sub_menu(menu_entry->sub_menu, warning->pos.x, warning->pos.y); if (error) { - LOG(("xwimp_create_sub_menu: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_sub_menu: 0x%x: %s", error->errnum, error->errmess); warn_user("MenuError", error->errmess); } } @@ -497,8 +491,7 @@ void ro_gui_menu_refresh(wimp_menu *menu) os_error *error; error = xwimp_create_menu(current_menu, 0, 0); if (error) { - LOG(("xwimp_create_menu: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_menu: 0x%x: %s", error->errnum, error->errmess); warn_user("MenuError", error->errmess); } } @@ -864,8 +857,7 @@ int ro_gui_menu_get_checksum(void) error = xwimp_get_menu_state((wimp_menu_state_flags)0, &menu_tree, 0, 0); if (error) { - LOG(("xwimp_get_menu_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_menu_state: 0x%x: %s", error->errnum, error->errmess); warn_user("MenuError", error->errmess); return 0; } @@ -908,8 +900,7 @@ bool ro_gui_menu_translate(struct menu_definition *menu) /* read current alphabet */ error = xosbyte1(osbyte_ALPHABET_NUMBER, 127, 0, &alphabet); if (error) { - LOG(("failed reading alphabet: 0x%x: %s", - error->errnum, error->errmess)); + LOG("failed reading alphabet: 0x%x: %s", error->errnum, error->errmess); /* assume Latin1 */ alphabet = territory_ALPHABET_LATIN1; } @@ -924,7 +915,7 @@ bool ro_gui_menu_translate(struct menu_definition *menu) 0, &translated); if (err != NSERROR_OK) { assert(err != NSERROR_BAD_ENCODING); - LOG(("utf8_to_enc failed")); + LOG("utf8_to_enc failed"); return false; } @@ -941,7 +932,7 @@ bool ro_gui_menu_translate(struct menu_definition *menu) 0, &translated); if (err != NSERROR_OK) { assert(err != NSERROR_BAD_ENCODING); - LOG(("utf8_to_enc failed")); + LOG("utf8_to_enc failed"); return false; } diff --git a/riscos/message.c b/riscos/message.c index d129d5d31..c97434b8a 100644 --- a/riscos/message.c +++ b/riscos/message.c @@ -63,8 +63,7 @@ bool ro_message_send_message(wimp_event_no event, wimp_message *message, /* send a message */ error = xwimp_send_message(event, message, task); if (error) { - LOG(("xwimp_send_message: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_send_message: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -101,8 +100,7 @@ bool ro_message_send_message_to_window(wimp_event_no event, wimp_message *messag /* send a message */ error = xwimp_send_message_to_window(event, message, to_w, to_i, to_t); if (error) { - LOG(("xwimp_send_message_to_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_send_message_to_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } diff --git a/riscos/mouse.c b/riscos/mouse.c index 92b65add3..e53a593ae 100644 --- a/riscos/mouse.c +++ b/riscos/mouse.c @@ -79,8 +79,7 @@ void ro_mouse_poll(void) error = xwimp_get_pointer_info(&pointer); if (error) { - LOG(("xwimp_get_pointer_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_pointer_info: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -193,7 +192,7 @@ void ro_mouse_track_start(void (*poll_end)(wimp_leaving *leaving, void *data), ro_mouse_ignore_leaving_event == false) ro_mouse_poll_end_callback(NULL, ro_mouse_poll_data); - LOG(("Unexpected mouse track termination.")); + LOG("Unexpected mouse track termination."); ro_mouse_ignore_leaving_event = false; ro_mouse_poll_end_callback = NULL; diff --git a/riscos/plotters.c b/riscos/plotters.c index e23242e74..38fd9d74a 100644 --- a/riscos/plotters.c +++ b/riscos/plotters.c @@ -85,8 +85,7 @@ bool ro_plot_rectangle(int x0, int y0, int x1, int y1, const plot_style_t *style colourtrans_USE_ECFS_GCOL, os_ACTION_OVERWRITE, 0, 0); if (error) { - LOG(("xcolourtrans_set_gcol: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xcolourtrans_set_gcol: 0x%x: %s", error->errnum, error->errmess); return false; } @@ -94,7 +93,7 @@ bool ro_plot_rectangle(int x0, int y0, int x1, int y1, const plot_style_t *style ro_plot_origin_x + x0 * 2, ro_plot_origin_y - y0 * 2 - 1); if (error) { - LOG(("xos_plot: 0x%x: %s", error->errnum, error->errmess)); + LOG("xos_plot: 0x%x: %s", error->errnum, error->errmess); return false; } @@ -102,7 +101,7 @@ bool ro_plot_rectangle(int x0, int y0, int x1, int y1, const plot_style_t *style ro_plot_origin_x + x1 * 2 - 1, ro_plot_origin_y - y1 * 2); if (error) { - LOG(("xos_plot: 0x%x: %s", error->errnum, error->errmess)); + LOG("xos_plot: 0x%x: %s", error->errnum, error->errmess); return false; } } @@ -197,16 +196,14 @@ bool ro_plot_draw_path(const draw_path * const path, int width, error = xcolourtrans_set_gcol(c << 8, 0, os_ACTION_OVERWRITE, 0, 0); if (error) { - LOG(("xcolourtrans_set_gcol: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xcolourtrans_set_gcol: 0x%x: %s", error->errnum, error->errmess); return false; } error = xdraw_stroke(path, 0, 0, 0, width * 2 * 256, &line_style, dash_pattern); if (error) { - LOG(("xdraw_stroke: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xdraw_stroke: 0x%x: %s", error->errnum, error->errmess); return false; } @@ -231,14 +228,12 @@ bool ro_plot_polygon(const int *p, unsigned int n, const plot_style_t *style) error = xcolourtrans_set_gcol(style->fill_colour << 8, 0, os_ACTION_OVERWRITE, 0, 0); if (error) { - LOG(("xcolourtrans_set_gcol: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xcolourtrans_set_gcol: 0x%x: %s", error->errnum, error->errmess); return false; } error = xdraw_fill((draw_path *) path, 0, 0, 0); if (error) { - LOG(("xdraw_fill: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xdraw_fill: 0x%x: %s", error->errnum, error->errmess); return false; } @@ -261,13 +256,13 @@ bool ro_plot_path(const float *p, unsigned int n, colour fill, float width, return true; if (p[0] != PLOTTER_PATH_MOVE) { - LOG(("path doesn't start with a move")); + LOG("path doesn't start with a move"); goto error; } path = malloc(sizeof *path * (n + 10)); if (!path) { - LOG(("out of memory")); + LOG("out of memory"); goto error; } @@ -295,7 +290,7 @@ bool ro_plot_path(const float *p, unsigned int n, colour fill, float width, path[i + 6] = -p[i + 6] * 2 * 256; i += 7; } else { - LOG(("bad path command %f", p[i])); + LOG("bad path command %f", p[i]); goto error; } } @@ -313,15 +308,13 @@ bool ro_plot_path(const float *p, unsigned int n, colour fill, float width, error = xcolourtrans_set_gcol(fill << 8, 0, os_ACTION_OVERWRITE, 0, 0); if (error) { - LOG(("xcolourtrans_set_gcol: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xcolourtrans_set_gcol: 0x%x: %s", error->errnum, error->errmess); goto error; } error = xdraw_fill((draw_path *) path, 0, &trfm, 0); if (error) { - LOG(("xdraw_stroke: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xdraw_stroke: 0x%x: %s", error->errnum, error->errmess); goto error; } } @@ -330,16 +323,14 @@ bool ro_plot_path(const float *p, unsigned int n, colour fill, float width, error = xcolourtrans_set_gcol(c << 8, 0, os_ACTION_OVERWRITE, 0, 0); if (error) { - LOG(("xcolourtrans_set_gcol: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xcolourtrans_set_gcol: 0x%x: %s", error->errnum, error->errmess); goto error; } error = xdraw_stroke((draw_path *) path, 0, &trfm, 0, width * 2 * 256, &line_style, 0); if (error) { - LOG(("xdraw_stroke: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xdraw_stroke: 0x%x: %s", error->errnum, error->errmess); goto error; } } @@ -366,8 +357,7 @@ bool ro_plot_clip(const struct rect *clip) int clip_y1 = ro_plot_origin_y - clip->y1 * 2; if (clip_x1 < clip_x0 || clip_y0 < clip_y1) { - LOG(("bad clip rectangle %i %i %i %i", - clip_x0, clip_y0, clip_x1, clip_y1)); + LOG("bad clip rectangle %i %i %i %i", clip_x0, clip_y0, clip_x1, clip_y1); return false; } @@ -383,7 +373,7 @@ bool ro_plot_clip(const struct rect *clip) error = xos_writen(buf, 9); if (error) { - LOG(("xos_writen: 0x%x: %s", error->errnum, error->errmess)); + LOG("xos_writen: 0x%x: %s", error->errnum, error->errmess); return false; } @@ -400,8 +390,7 @@ bool ro_plot_text(int x, int y, const char *text, size_t length, fstyle->background << 8, fstyle->foreground << 8, 14, 0, 0, 0); if (error) { - LOG(("xcolourtrans_set_font_colours: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xcolourtrans_set_font_colours: 0x%x: %s", error->errnum, error->errmess); return false; } @@ -418,20 +407,19 @@ bool ro_plot_disc(int x, int y, int radius, const plot_style_t *style) error = xcolourtrans_set_gcol(style->fill_colour << 8, 0, os_ACTION_OVERWRITE, 0, 0); if (error) { - LOG(("xcolourtrans_set_gcol: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xcolourtrans_set_gcol: 0x%x: %s", error->errnum, error->errmess); return false; } error = xos_plot(os_MOVE_TO, ro_plot_origin_x + x * 2, ro_plot_origin_y - y * 2); if (error) { - LOG(("xos_plot: 0x%x: %s", error->errnum, error->errmess)); + LOG("xos_plot: 0x%x: %s", error->errnum, error->errmess); return false; } error = xos_plot(os_PLOT_CIRCLE | os_PLOT_BY, radius * 2, 0); if (error) { - LOG(("xos_plot: 0x%x: %s", error->errnum, error->errmess)); + LOG("xos_plot: 0x%x: %s", error->errnum, error->errmess); return false; } } @@ -441,22 +429,21 @@ bool ro_plot_disc(int x, int y, int radius, const plot_style_t *style) error = xcolourtrans_set_gcol(style->stroke_colour << 8, 0, os_ACTION_OVERWRITE, 0, 0); if (error) { - LOG(("xcolourtrans_set_gcol: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xcolourtrans_set_gcol: 0x%x: %s", error->errnum, error->errmess); return false; } error = xos_plot(os_MOVE_TO, ro_plot_origin_x + x * 2, ro_plot_origin_y - y * 2); if (error) { - LOG(("xos_plot: 0x%x: %s", error->errnum, error->errmess)); + LOG("xos_plot: 0x%x: %s", error->errnum, error->errmess); return false; } error = xos_plot(os_PLOT_CIRCLE_OUTLINE | os_PLOT_BY, radius * 2, 0); if (error) { - LOG(("xos_plot: 0x%x: %s", error->errnum, error->errmess)); + LOG("xos_plot: 0x%x: %s", error->errnum, error->errmess); return false; } } @@ -477,8 +464,7 @@ bool ro_plot_arc(int x, int y, int radius, int angle1, int angle2, const plot_st os_ACTION_OVERWRITE, 0, 0); if (error) { - LOG(("xcolourtrans_set_gcol: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xcolourtrans_set_gcol: 0x%x: %s", error->errnum, error->errmess); return false; } @@ -492,19 +478,19 @@ bool ro_plot_arc(int x, int y, int radius, int angle1, int angle2, const plot_st error = xos_plot(os_MOVE_TO, x, y); /* move to centre */ if (error) { - LOG(("xos_plot: 0x%x: %s", error->errnum, error->errmess)); + LOG("xos_plot: 0x%x: %s", error->errnum, error->errmess); return false; } error = xos_plot(os_MOVE_TO, sx, sy); /* move to start */ if (error) { - LOG(("xos_plot: 0x%x: %s", error->errnum, error->errmess)); + LOG("xos_plot: 0x%x: %s", error->errnum, error->errmess); return false; } error = xos_plot(os_PLOT_ARC | os_PLOT_TO, ex, ey); /* arc to end */ if (error) { - LOG(("xos_plot: 0x%x: %s", error->errnum, error->errmess)); + LOG("xos_plot: 0x%x: %s", error->errnum, error->errmess); return false; } @@ -521,7 +507,7 @@ bool ro_plot_bitmap(int x, int y, int width, int height, buffer = riscos_bitmap_get_buffer(bitmap); if (!buffer) { - LOG(("bitmap_get_buffer failed")); + LOG("bitmap_get_buffer failed"); return false; } diff --git a/riscos/print.c b/riscos/print.c index 829029eda..0fb9a9a44 100644 --- a/riscos/print.c +++ b/riscos/print.c @@ -196,7 +196,7 @@ void ro_gui_print_prepare(struct gui_window *g) /* Read Printer Driver name */ error = xpdriver_info(0, 0, 0, 0, &desc, 0, 0, 0); if (error) { - LOG(("xpdriver_info: 0x%x: %s", error->errnum, error->errmess)); + LOG("xpdriver_info: 0x%x: %s", error->errnum, error->errmess); printers_exists = false; } @@ -333,8 +333,7 @@ void print_send_printsave(hlcache_handle *h) e = xwimp_send_message(wimp_USER_MESSAGE_RECORDED, (wimp_message *)&m, 0); if (e) { - LOG(("xwimp_send_message: 0x%x: %s", - e->errnum, e->errmess)); + LOG("xwimp_send_message: 0x%x: %s", e->errnum, e->errmess); warn_user("WimpError", e->errmess); ro_print_cleanup(); } @@ -358,8 +357,7 @@ bool print_send_printtypeknown(wimp_message *m) m->action = message_PRINT_TYPE_KNOWN; e = xwimp_send_message(wimp_USER_MESSAGE, m, m->sender); if (e) { - LOG(("xwimp_send_message: 0x%x: %s", - e->errnum, e->errmess)); + LOG("xwimp_send_message: 0x%x: %s", e->errnum, e->errmess); warn_user("WimpError", e->errmess); return false; } @@ -465,8 +463,7 @@ bool ro_print_ack(wimp_message *m) /* read printer driver type */ error = xpdriver_info(&info_type, 0, 0, 0, 0, 0, 0, 0); if (error) { - LOG(("xpdriver_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xpdriver_info: 0x%x: %s", error->errnum, error->errmess); warn_user("PrintError", error->errmess); ro_print_cleanup(); return true; @@ -491,8 +488,7 @@ bool ro_print_ack(wimp_message *m) error = xwimp_send_message(wimp_USER_MESSAGE_RECORDED, m, m->sender); if (error) { - LOG(("xwimp_send_message: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_send_message: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); /* and delete temporary file */ xosfile_delete(m->data.data_xfer.file_name, @@ -564,8 +560,7 @@ bool print_document(struct gui_window *g, const char *filename) /* read printer driver features */ error = xpdriver_info(0, 0, 0, &features, 0, 0, 0, 0); if (error) { - LOG(("xpdriver_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xpdriver_info: 0x%x: %s", error->errnum, error->errmess); warn_user("PrintError", error->errmess); return false; } @@ -573,8 +568,7 @@ bool print_document(struct gui_window *g, const char *filename) /* read page size */ error = xpdriver_page_size(0, 0, &left, &bottom, &right, &top); if (error) { - LOG(("xpdriver_page_size: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xpdriver_page_size: 0x%x: %s", error->errnum, error->errmess); warn_user("PrintError", error->errmess); return false; } @@ -597,8 +591,7 @@ bool print_document(struct gui_window *g, const char *filename) error = xosfind_openoutw(osfind_NO_PATH | osfind_ERROR_IF_DIR | osfind_ERROR_IF_ABSENT, filename, 0, &fhandle); if (error) { - LOG(("xosfind_openoutw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfind_openoutw: 0x%x: %s", error->errnum, error->errmess); warn_user("PrintError", error->errmess); return false; } @@ -606,8 +599,7 @@ bool print_document(struct gui_window *g, const char *filename) /* select print job */ error = xpdriver_select_jobw(fhandle, "NetSurf", &old_job); if (error) { - LOG(("xpdriver_select_jobw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xpdriver_select_jobw: 0x%x: %s", error->errnum, error->errmess); warn_user("PrintError", error->errmess); xosfind_closew(fhandle); return false; @@ -667,21 +659,18 @@ bool print_document(struct gui_window *g, const char *filename) /* give page rectangle */ error = xpdriver_give_rectangle(0, &b, &t, &p, os_COLOUR_WHITE); if (error) { - LOG(("xpdriver_give_rectangle: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xpdriver_give_rectangle: 0x%x: %s", error->errnum, error->errmess); error_message = error->errmess; goto error; } - LOG(("given rectangle: [(%d, %d), (%d, %d)]", - b.x0, b.y0, b.x1, b.y1)); + LOG("given rectangle: [(%d, %d), (%d, %d)]", b.x0, b.y0, b.x1, b.y1); /* and redraw the document */ error = xpdriver_draw_page(print_num_copies, &b, 0, 0, &more, 0); if (error) { - LOG(("xpdriver_draw_page: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xpdriver_draw_page: 0x%x: %s", error->errnum, error->errmess); error_message = error->errmess; goto error; } @@ -695,8 +684,7 @@ bool print_document(struct gui_window *g, const char *filename) .plot = &ro_plotters }; - LOG(("redrawing area: [(%d, %d), (%d, %d)]", - b.x0, b.y0, b.x1, b.y1)); + LOG("redrawing area: [(%d, %d), (%d, %d)]", b.x0, b.y0, b.x1, b.y1); clip.x0 = (b.x0 - ro_plot_origin_x) / 2; clip.y0 = (ro_plot_origin_y - b.y1) / 2; clip.x1 = (b.x1 - ro_plot_origin_x) / 2; @@ -718,8 +706,7 @@ bool print_document(struct gui_window *g, const char *filename) error = xpdriver_get_rectangle(&b, &more, 0); if (error) { - LOG(("xpdriver_get_rectangle: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xpdriver_get_rectangle: 0x%x: %s", error->errnum, error->errmess); error_message = error->errmess; goto error; } @@ -741,16 +728,14 @@ bool print_document(struct gui_window *g, const char *filename) error = (os_error *) _swix(PDriver_EndJob, _IN(0), (int) fhandle); if (error) { - LOG(("xpdriver_end_jobw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xpdriver_end_jobw: 0x%x: %s", error->errnum, error->errmess); error_message = error->errmess; goto error; } error = xosfind_closew(fhandle); if (error) { - LOG(("xosfind_closew: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfind_closew: 0x%x: %s", error->errnum, error->errmess); warn_user("PrintError", error->errmess); return false; } @@ -758,8 +743,7 @@ bool print_document(struct gui_window *g, const char *filename) if (old_job) { error = xpdriver_select_jobw(old_job, 0, 0); if (error) { - LOG(("xpdriver_select_jobw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xpdriver_select_jobw: 0x%x: %s", error->errnum, error->errmess); warn_user("PrintError", error->errmess); /* the printing succeeded anyway */ return true; @@ -840,20 +824,18 @@ const char *print_declare_fonts(hlcache_handle *h) } for (i = 0; i != print_fonts_count; ++i) { - LOG(("%u %s", i, print_fonts_list[i])); + LOG("%u %s", i, print_fonts_list[i]); error = xpdriver_declare_font(0, print_fonts_list[i], pdriver_KERNED); if (error) { - LOG(("xpdriver_declare_font: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xpdriver_declare_font: 0x%x: %s", error->errnum, error->errmess); error_message = error->errmess; goto end; } } error = xpdriver_declare_font(0, 0, 0); if (error) { - LOG(("xpdriver_declare_font: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xpdriver_declare_font: 0x%x: %s", error->errnum, error->errmess); error_message = error->errmess; goto end; } @@ -932,13 +914,10 @@ bool print_fonts_plot_text(int x, int y, const char *text, size_t length, text, length, 0, 0, print_fonts_callback, 0); if (code != rufl_OK) { if (code == rufl_FONT_MANAGER_ERROR) { - LOG(("rufl_paint_callback: rufl_FONT_MANAGER_ERROR: " - "0x%x: %s", - rufl_fm_error->errnum, - rufl_fm_error->errmess)); + LOG("rufl_paint_callback: rufl_FONT_MANAGER_ERROR: ""0x%x: %s", rufl_fm_error->errnum, rufl_fm_error->errmess); print_fonts_error = rufl_fm_error->errmess; } else { - LOG(("rufl_paint_callback: 0x%x", code)); + LOG("rufl_paint_callback: 0x%x", code); } return false; } diff --git a/riscos/query.c b/riscos/query.c index aa7492196..178dcaf5b 100644 --- a/riscos/query.c +++ b/riscos/query.c @@ -175,7 +175,7 @@ query_id query_user_xy(const char *query, const char *detail, err = utf8_to_local_encoding(yes, 0, &local_text); if (err != NSERROR_OK) { assert(err != NSERROR_BAD_ENCODING); - LOG(("utf8_to_local_encoding_failed")); + LOG("utf8_to_local_encoding_failed"); local_text = NULL; } @@ -191,8 +191,7 @@ query_id query_user_xy(const char *query, const char *detail, error = xwimptextop_string_width(icn->data.indirected_text.text, len, &width); if (error) { - LOG(("xwimptextop_string_width: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xwimptextop_string_width: 0x%x:%s", error->errnum, error->errmess); width = len * 16; } if (!query_yes_width) query_yes_width = icn->extent.x1 - icn->extent.x0; @@ -205,7 +204,7 @@ query_id query_user_xy(const char *query, const char *detail, err = utf8_to_local_encoding(no, 0, &local_text); if (err != NSERROR_OK) { assert(err != NSERROR_BAD_ENCODING); - LOG(("utf8_to_local_encoding_failed")); + LOG("utf8_to_local_encoding_failed"); local_text = NULL; } @@ -223,8 +222,7 @@ query_id query_user_xy(const char *query, const char *detail, icn->extent.x1 = tx - 16; error = xwimptextop_string_width(icn->data.indirected_text.text, len, &width); if (error) { - LOG(("xwimptextop_string_width: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xwimptextop_string_width: 0x%x:%s", error->errnum, error->errmess); width = len * 16; } width += 28; @@ -265,8 +263,7 @@ query_id query_user_xy(const char *query, const char *detail, error = xwimp_set_caret_position(qw->window, (wimp_i)-1, 0, 0, 1 << 25, -1); if (error) { - LOG(("xwimp_get_caret_position: 0x%x : %s", - error->errnum, error->errmess)); + LOG("xwimp_get_caret_position: 0x%x : %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -310,8 +307,7 @@ void ro_gui_query_window_bring_to_front(query_id id) error = xwimp_set_caret_position(qw->window, (wimp_i)-1, 0, 0, 1 << 25, -1); if (error) { - LOG(("xwimp_get_caret_position: 0x%x : %s", - error->errnum, error->errmess)); + LOG("xwimp_get_caret_position: 0x%x : %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -331,8 +327,7 @@ void ro_gui_query_close(wimp_w w) ro_gui_dialog_close(w); error = xwimp_delete_window(qw->window); if (error) { - LOG(("xwimp_delete_window: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xwimp_delete_window: 0x%x:%s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } ro_gui_wimp_event_finalise(w); diff --git a/riscos/save.c b/riscos/save.c index 1d2fce484..1816cec0d 100644 --- a/riscos/save.c +++ b/riscos/save.c @@ -180,7 +180,7 @@ wimp_w ro_gui_saveas_create(const char *template_name) error = xosmodule_alloc(area_size, (void **) &area); if (error) { - LOG(("xosmodule_alloc: 0x%x: %s", error->errnum, error->errmess)); + LOG("xosmodule_alloc: 0x%x: %s", error->errnum, error->errmess); xwimp_close_template(); die(error->errmess); } else { @@ -190,8 +190,7 @@ wimp_w ro_gui_saveas_create(const char *template_name) error = xosspriteop_clear_sprites(osspriteop_USER_AREA, saveas_area); if (error) { - LOG(("xosspriteop_clear_sprites: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosspriteop_clear_sprites: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); xosmodule_free(saveas_area); @@ -207,8 +206,7 @@ wimp_w ro_gui_saveas_create(const char *template_name) /* create window */ error = xwimp_create_window(window, &w); if (error) { - LOG(("xwimp_create_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_window: 0x%x: %s", error->errnum, error->errmess); xwimp_close_template(); die(error->errmess); } @@ -229,7 +227,7 @@ void ro_gui_saveas_quit(void) if (saveas_area) { os_error *error = xosmodule_free(saveas_area); if (error) { - LOG(("xosmodule_free: 0x%x: %s", error->errnum, error->errmess)); + LOG("xosmodule_free: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); } saveas_area = NULL; @@ -384,8 +382,7 @@ void gui_drag_save_object(struct gui_window *g, hlcache_handle *c, error = xwimp_get_pointer_info(&pointer); if (error) { - LOG(("xwimp_get_pointer_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_pointer_info: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -423,8 +420,7 @@ void gui_drag_save_selection(struct gui_window *g, const char *selection) error = xwimp_get_pointer_info(&pointer); if (error) { - LOG(("xwimp_get_pointer_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_pointer_info: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -477,8 +473,7 @@ void ro_gui_drag_save_link(gui_save_type save_type, const nsurl *url, error = xwimp_get_pointer_info(&pointer); if (error) { - LOG(("xwimp_get_pointer_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_pointer_info: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -516,8 +511,7 @@ void ro_gui_drag_icon(int x, int y, const char *sprite) saveas_area, (osspriteop_id)sprite, NULL); if (error) { if (error->errnum != error_SPRITE_OP_DOESNT_EXIST) { - LOG(("xosspriteop_select_sprite: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosspriteop_select_sprite: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); } } @@ -537,8 +531,7 @@ void ro_gui_drag_icon(int x, int y, const char *sprite) return; } - LOG(("xdragasprite_start: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xdragasprite_start: 0x%x: %s", error->errnum, error->errmess); } drag.type = wimp_DRAG_USER_FIXED; @@ -551,8 +544,7 @@ void ro_gui_drag_icon(int x, int y, const char *sprite) error = xwimp_drag_box(&drag); if (error) { - LOG(("xwimp_drag_box: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_drag_box: 0x%x: %s", error->errnum, error->errmess); warn_user("DragError", error->errmess); } else @@ -591,16 +583,14 @@ void ro_gui_drag_box_cancel(void) if (using_dragasprite) { error = xdragasprite_stop(); if (error) { - LOG(("xdragasprite_stop: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xdragasprite_stop: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } else { error = xwimp_drag_box(NULL); if (error) { - LOG(("xwimp_drag_box: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_drag_box: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -630,8 +620,7 @@ static void ro_gui_save_drag_end(wimp_dragged *drag, void *data) error = xwimp_get_pointer_info(&pointer); if (error) { - LOG(("xwimp_get_pointer_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_pointer_info: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -768,7 +757,7 @@ void ro_gui_save_datasave_ack(wimp_message *message) default: if (!gui_save_content) { - LOG(("unexpected DataSaveAck: gui_save_content not set")); + LOG("unexpected DataSaveAck: gui_save_content not set"); return; } break; @@ -818,7 +807,7 @@ bool ro_gui_save_content(hlcache_handle *h, char *path, bool force_overwrite) error = xosfile_read_stamped(path, &obj_type, NULL, NULL, NULL, NULL, NULL); if (error) { - LOG(("xosfile_read_stamped: 0x%x:%s", error->errnum, error->errmess)); + LOG("xosfile_read_stamped: 0x%x:%s", error->errnum, error->errmess); warn_user("SaveError", error->errmess); return false; } @@ -875,8 +864,7 @@ bool ro_gui_save_content(hlcache_handle *h, char *path, bool force_overwrite) (byte *) source_data, (byte *) source_data + source_size); if (error) { - LOG(("xosfile_save_stamped: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_save_stamped: 0x%x: %s", error->errnum, error->errmess); warn_user("SaveError", error->errmess); return false; } @@ -902,16 +890,14 @@ bool ro_gui_save_content(hlcache_handle *h, char *path, bool force_overwrite) return false; error = xosfile_set_type(path, 0xfaf); if (error) - LOG(("xosfile_set_type: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_set_type: 0x%x: %s", error->errnum, error->errmess); break; case GUI_SAVE_HISTORY_EXPORT_HTML: if (global_history_export(path, NULL) != NSERROR_OK) return false; error = xosfile_set_type(path, 0xfaf); if (error) - LOG(("xosfile_set_type: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_set_type: 0x%x: %s", error->errnum, error->errmess); break; case GUI_SAVE_TEXT_SELECTION: @@ -931,8 +917,7 @@ bool ro_gui_save_content(hlcache_handle *h, char *path, bool force_overwrite) return ro_gui_save_clipboard(path); default: - LOG(("Unexpected content type: %d, path %s", - gui_save_current_type, path)); + LOG("Unexpected content type: %d, path %s", gui_save_current_type, path); return false; } return true; @@ -955,8 +940,7 @@ void ro_gui_save_done(void) error = xwimp_send_message(wimp_USER_MESSAGE, message, message->sender); if (error) { - LOG(("xwimp_send_message: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_send_message: 0x%x: %s", error->errnum, error->errmess); warn_user("SaveError", error->errmess); } } @@ -996,8 +980,7 @@ void ro_gui_save_done(void) ro_gui_dialog_close(dialog_saveas); error = xwimp_create_menu(wimp_CLOSE_MENU, 0, 0); if (error) { - LOG(("xwimp_create_menu: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_menu: 0x%x: %s", error->errnum, error->errmess); warn_user("MenuError", error->errmess); } } @@ -1014,8 +997,7 @@ static void ro_gui_save_set_file_type(const char *path, lwc_string *mime_type) error = xosfile_set_type(path, rotype); if (error != NULL) { - LOG(("xosfile_set_type: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_set_type: 0x%x: %s", error->errnum, error->errmess); } } @@ -1042,8 +1024,7 @@ bool ro_gui_save_complete(hlcache_handle *h, char *path) /* Create dir */ error = xosfile_create_dir(path, 0); if (error) { - LOG(("xosfile_create_dir: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_create_dir: 0x%x: %s", error->errnum, error->errmess); warn_user("SaveError", error->errmess); return false; } @@ -1052,7 +1033,7 @@ bool ro_gui_save_complete(hlcache_handle *h, char *path) snprintf(buf, sizeof buf, "%s.!Run", path); fp = fopen(buf, "w"); if (!fp) { - LOG(("fopen(): errno = %i", errno)); + LOG("fopen(): errno = %i", errno); warn_user("SaveError", strerror(errno)); return false; } @@ -1061,8 +1042,7 @@ bool ro_gui_save_complete(hlcache_handle *h, char *path) fclose(fp); error = xosfile_set_type(buf, 0xfeb); if (error) { - LOG(("xosfile_set_type: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_set_type: 0x%x: %s", error->errnum, error->errmess); warn_user("SaveError", error->errmess); return false; } @@ -1071,7 +1051,7 @@ bool ro_gui_save_complete(hlcache_handle *h, char *path) snprintf(buf, sizeof buf, "%s.!RunImage", path); fp = fopen(buf, "w"); if (!fp) { - LOG(("Creating !RunImage failed: errno = %i", errno)); + LOG("Creating !RunImage failed: errno = %i", errno); } else { fclose(fp); } @@ -1097,8 +1077,7 @@ bool ro_gui_save_complete(hlcache_handle *h, char *path) error = xosspriteop_save_sprite_file(osspriteop_NAME, saveas_area, buf); if (error) { - LOG(("xosspriteop_save_sprite_file: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosspriteop_save_sprite_file: 0x%x: %s", error->errnum, error->errmess); warn_user("SaveError", error->errmess); return false; } @@ -1130,8 +1109,7 @@ bool ro_gui_save_object_native(hlcache_handle *h, char *path) (byte *) source_data, (byte *) source_data + source_size); if (error != NULL) { - LOG(("xosfile_save_stamped: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_save_stamped: 0x%x: %s", error->errnum, error->errmess); warn_user("SaveError", error->errmess); return false; } @@ -1330,8 +1308,7 @@ void ro_gui_save_set_state(hlcache_handle *h, gui_save_type save_type, } if (error) { - LOG(("ro_gui_wimp_get_sprite: 0x%x: %s", - error->errnum, error->errmess)); + LOG("ro_gui_wimp_get_sprite: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); } else { /* the sprite area should always be large enough for @@ -1370,14 +1347,14 @@ bool ro_gui_save_create_thumbnail(hlcache_handle *h, const char *name) bitmap = riscos_bitmap_create(34, 34, BITMAP_NEW | BITMAP_OPAQUE | BITMAP_CLEAR_MEMORY); if (!bitmap) { - LOG(("Thumbnail initialisation failed.")); + LOG("Thumbnail initialisation failed."); return false; } riscos_bitmap_render(bitmap, h); area = riscos_bitmap_convert_8bpp(bitmap); riscos_bitmap_destroy(bitmap); if (!area) { - LOG(("Thumbnail conversion failed.")); + LOG("Thumbnail conversion failed."); return false; } diff --git a/riscos/save_draw.c b/riscos/save_draw.c index bf81bca10..8b8d72cd6 100644 --- a/riscos/save_draw.c +++ b/riscos/save_draw.c @@ -142,8 +142,7 @@ bool save_as_draw(hlcache_handle *h, const char *path) (byte *) drawfile_buffer, (byte *) drawfile_buffer + drawfile_size); if (error) { - LOG(("xosfile_save_stamped failed: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_save_stamped failed: 0x%x: %s", error->errnum, error->errmess); warn_user("SaveError", error->errmess); pencil_free(ro_save_draw_diagram); return false; @@ -271,13 +270,13 @@ bool ro_save_draw_path(const float *p, unsigned int n, colour fill, return true; if (p[0] != PLOTTER_PATH_MOVE) { - LOG(("path doesn't start with a move")); + LOG("path doesn't start with a move"); return false; } int *path = malloc(sizeof *path * (n + 10)); if (!path) { - LOG(("out of memory")); + LOG("out of memory"); return false; } @@ -329,7 +328,7 @@ bool ro_save_draw_path(const float *p, unsigned int n, colour fill, i += 7; empty_path = false; } else { - LOG(("bad path command %f", p[i])); + LOG("bad path command %f", p[i]); free(path); return false; } @@ -450,7 +449,7 @@ bool ro_save_draw_group_end(void) bool ro_save_draw_error(pencil_code code) { - LOG(("code %i", code)); + LOG("code %i", code); switch (code) { case pencil_OK: diff --git a/riscos/schedule.c b/riscos/schedule.c index 59cb97d9b..54308b7a9 100644 --- a/riscos/schedule.c +++ b/riscos/schedule.c @@ -108,7 +108,7 @@ nserror riscos_schedule(int t, void (*callback)(void *p), void *p) entry = malloc(sizeof *entry); if (!entry) { - LOG(("malloc failed")); + LOG("malloc failed"); return NSERROR_NOMEM; } diff --git a/riscos/sslcert.c b/riscos/sslcert.c index d8d94a32c..5812dff12 100644 --- a/riscos/sslcert.c +++ b/riscos/sslcert.c @@ -122,7 +122,7 @@ void gui_cert_verify(nsurl *url, sslcert_window = malloc(sizeof(struct ro_sslcert)); if (sslcert_window == NULL) { - LOG(("Failed to allocate memory for SSL Cert Dialog")); + LOG("Failed to allocate memory for SSL Cert Dialog"); return; } @@ -131,8 +131,7 @@ void gui_cert_verify(nsurl *url, error = xwimp_create_window(ro_gui_cert_dialog_template, &(sslcert_window->window)); if (error) { - LOG(("xwimp_create_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_window: 0x%x: %s", error->errnum, error->errmess); free(sslcert_window); return; } @@ -140,8 +139,7 @@ void gui_cert_verify(nsurl *url, error = xwimp_create_window(ro_gui_cert_tree_template, &(sslcert_window->pane)); if (error) { - LOG(("xwimp_create_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_window: 0x%x: %s", error->errnum, error->errmess); free(sslcert_window); return; } @@ -154,7 +152,7 @@ void gui_cert_verify(nsurl *url, sslcert_window->tv = ro_treeview_create(sslcert_window->pane, NULL, NULL, TREE_SSLCERT); if (sslcert_window->tv == NULL) { - LOG(("Failed to allocate treeview")); + LOG("Failed to allocate treeview"); free(sslcert_window); return; } @@ -189,8 +187,7 @@ void gui_cert_verify(nsurl *url, error = xwimp_get_window_info_header_only(&info); if (error) { ro_gui_cert_release_window(sslcert_window); - LOG(("xwimp_get_window_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_info: 0x%x: %s", error->errnum, error->errmess); return; } @@ -198,8 +195,7 @@ void gui_cert_verify(nsurl *url, error = xwimp_get_window_state(&state); if (error) { ro_gui_cert_release_window(sslcert_window); - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); return; } @@ -208,8 +204,7 @@ void gui_cert_verify(nsurl *url, error = xwimp_get_icon_state(&istate); if (error) { ro_gui_cert_release_window(sslcert_window); - LOG(("xwimp_get_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess); return; } @@ -240,8 +235,7 @@ void gui_cert_verify(nsurl *url, error = xwimp_set_extent(sslcert_window->pane, &(info.extent)); if (error) { ro_gui_cert_release_window(sslcert_window); - LOG(("xwimp_set_extent: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_extent: 0x%x: %s", error->errnum, error->errmess); return; } } @@ -258,8 +252,7 @@ void gui_cert_verify(nsurl *url, << wimp_CHILD_RS_EDGE_SHIFT); if (error) { ro_gui_cert_release_window(sslcert_window); - LOG(("xwimp_open_window_nested: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window_nested: 0x%x: %s", error->errnum, error->errmess); ro_gui_cert_release_window(sslcert_window); return; } @@ -335,21 +328,19 @@ void ro_gui_cert_release_window(struct ro_sslcert *s) if (s == NULL) return; - LOG(("Releasing SSL data: 0x%x", (unsigned) s)); + LOG("Releasing SSL data: 0x%x", (unsigned)s); ro_gui_wimp_event_finalise(s->window); ro_treeview_destroy(s->tv); error = xwimp_delete_window(s->window); if (error) { - LOG(("xwimp_delete_window: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xwimp_delete_window: 0x%x:%s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } error = xwimp_delete_window(s->pane); if (error) { - LOG(("xwimp_delete_window: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xwimp_delete_window: 0x%x:%s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } diff --git a/riscos/textarea.c b/riscos/textarea.c index bec6711b9..ecf3e0c3d 100644 --- a/riscos/textarea.c +++ b/riscos/textarea.c @@ -139,7 +139,7 @@ uintptr_t ro_textarea_create(wimp_w parent, wimp_i icon, unsigned int flags, ret = malloc(sizeof(struct text_area)); if (!ret) { - LOG(("malloc failed")); + LOG("malloc failed"); return 0; } @@ -149,7 +149,7 @@ uintptr_t ro_textarea_create(wimp_w parent, wimp_i icon, unsigned int flags, ret->flags = flags; ret->text = malloc(64); if (!ret->text) { - LOG(("malloc failed")); + LOG("malloc failed"); free(ret); return 0; } @@ -161,7 +161,7 @@ uintptr_t ro_textarea_create(wimp_w parent, wimp_i icon, unsigned int flags, // ret->selection_end = (unsigned int)-1; ret->font_family = strdup(font_family ? font_family : "Corpus"); if (!ret->font_family) { - LOG(("strdup failed")); + LOG("strdup failed"); free(ret->text); free(ret); return 0; @@ -182,8 +182,7 @@ uintptr_t ro_textarea_create(wimp_w parent, wimp_i icon, unsigned int flags, text_area_definition.title_fg = wimp_COLOUR_BLACK; error = xwimp_create_window(&text_area_definition, &ret->window); if (error) { - LOG(("xwimp_create_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_window: 0x%x: %s", error->errnum, error->errmess); free(ret->font_family); free(ret->text); free(ret); @@ -230,8 +229,7 @@ bool ro_textarea_update(uintptr_t self) state.w = ta->parent; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); return false; } @@ -239,8 +237,7 @@ bool ro_textarea_update(uintptr_t self) istate.i = ta->icon; error = xwimp_get_icon_state(&istate); if (error) { - LOG(("xwimp_get_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess); return false; } @@ -271,8 +268,7 @@ bool ro_textarea_update(uintptr_t self) error = xwimp_set_extent(ta->window, &extent); if (error) { - LOG(("xwimp_set_extent: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_extent: 0x%x: %s", error->errnum, error->errmess); return false; } @@ -287,8 +283,7 @@ bool ro_textarea_update(uintptr_t self) wimp_CHILD_LINKS_PARENT_VISIBLE_BOTTOM_OR_LEFT << wimp_CHILD_RS_EDGE_SHIFT); if (error) { - LOG(("xwimp_open_window_nested: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window_nested: 0x%x: %s", error->errnum, error->errmess); return false; } @@ -313,8 +308,7 @@ void ro_textarea_destroy(uintptr_t self) error = xwimp_delete_window(ta->window); if (error) { - LOG(("xwimp_delete_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_delete_window: 0x%x: %s", error->errnum, error->errmess); } ro_gui_wimp_event_finalise(ta->window); @@ -338,14 +332,14 @@ bool ro_textarea_set_text(uintptr_t self, const char *text) ta = (struct text_area *)self; if (!ta || ta->magic != MAGIC) { - LOG(("magic doesn't match")); + LOG("magic doesn't match"); return true; } if (len >= ta->text_alloc) { char *temp = realloc(ta->text, len + 64); if (!temp) { - LOG(("realloc failed")); + LOG("realloc failed"); return false; } ta->text = temp; @@ -375,7 +369,7 @@ int ro_textarea_get_text(uintptr_t self, char *buf, unsigned int len) ta = (struct text_area *)self; if (!ta || ta->magic != MAGIC) { - LOG(("magic doesn't match")); + LOG("magic doesn't match"); return -1; } @@ -385,7 +379,7 @@ int ro_textarea_get_text(uintptr_t self, char *buf, unsigned int len) } if (len < ta->text_len) { - LOG(("buffer too small")); + LOG("buffer too small"); return -1; } @@ -410,7 +404,7 @@ void ro_textarea_insert_text(uintptr_t self, unsigned int index, ta = (struct text_area *)self; if (!ta || ta->magic != MAGIC) { - LOG(("magic doesn't match")); + LOG("magic doesn't match"); return; } @@ -427,7 +421,7 @@ void ro_textarea_insert_text(uintptr_t self, unsigned int index, if (b_len + ta->text_len >= ta->text_alloc) { char *temp = realloc(ta->text, b_len + ta->text_len + 64); if (!temp) { - LOG(("realloc failed")); + LOG("realloc failed"); return; } @@ -464,7 +458,7 @@ void ro_textarea_replace_text(uintptr_t self, unsigned int start, ta = (struct text_area *)self; if (!ta || ta->magic != MAGIC) { - LOG(("magic doesn't match")); + LOG("magic doesn't match"); return; } @@ -498,7 +492,7 @@ void ro_textarea_replace_text(uintptr_t self, unsigned int start, char *temp = realloc(ta->text, b_len + ta->text_len - (b_end - b_start) + 64); if (!temp) { - LOG(("realloc failed")); + LOG("realloc failed"); return; } @@ -539,7 +533,7 @@ void ro_textarea_set_caret(uintptr_t self, unsigned int caret) ta = (struct text_area *)self; if (!ta || ta->magic != MAGIC) { - LOG(("magic doesn't match")); + LOG("magic doesn't match"); return; } @@ -581,11 +575,9 @@ void ro_textarea_set_caret(uintptr_t self, unsigned int caret) b_off - ta->lines[ta->caret_pos.line].b_start, &x); if (code != rufl_OK) { if (code == rufl_FONT_MANAGER_ERROR) - LOG(("rufl_width: 0x%x: %s", - rufl_fm_error->errnum, - rufl_fm_error->errmess)); + LOG("rufl_width: 0x%x: %s", rufl_fm_error->errnum, rufl_fm_error->errmess); else - LOG(("rufl_width: 0x%x", code)); + LOG("rufl_width: 0x%x", code); return; } @@ -594,8 +586,7 @@ void ro_textarea_set_caret(uintptr_t self, unsigned int caret) ta->line_height / 4 + ta->line_spacing, os_line_height.y, -1); if (error) { - LOG(("xwimp_set_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess); return; } } @@ -619,7 +610,7 @@ void ro_textarea_set_caret_xy(uintptr_t self, int x, int y) ta = (struct text_area *)self; if (!ta || ta->magic != MAGIC) { - LOG(("magic doesn't match")); + LOG("magic doesn't match"); return; } @@ -633,8 +624,7 @@ void ro_textarea_set_caret_xy(uintptr_t self, int x, int y) state.w = ta->window; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); return; } @@ -655,11 +645,9 @@ void ro_textarea_set_caret_xy(uintptr_t self, int x, int y) x, &b_off, &x); if (code != rufl_OK) { if (code == rufl_FONT_MANAGER_ERROR) - LOG(("rufl_x_to_offset: 0x%x: %s", - rufl_fm_error->errnum, - rufl_fm_error->errmess)); + LOG("rufl_x_to_offset: 0x%x: %s", rufl_fm_error->errnum, rufl_fm_error->errmess); else - LOG(("rufl_x_to_offset: 0x%x", code)); + LOG("rufl_x_to_offset: 0x%x", code); return; } @@ -683,7 +671,7 @@ unsigned int ro_textarea_get_caret(uintptr_t self) ta = (struct text_area *)self; if (!ta || ta->magic != MAGIC) { - LOG(("magic doesn't match")); + LOG("magic doesn't match"); return -1; } @@ -724,7 +712,7 @@ void ro_textarea_reflow(struct text_area *ta, unsigned int line) ta->lines = malloc(LINE_CHUNK_SIZE * sizeof(struct line_info)); if (!ta->lines) { - LOG(("malloc failed")); + LOG("malloc failed"); return; } } @@ -747,11 +735,9 @@ void ro_textarea_reflow(struct text_area *ta, unsigned int line) &b_off, &x); if (code != rufl_OK) { if (code == rufl_FONT_MANAGER_ERROR) - LOG(("rufl_x_to_offset: 0x%x: %s", - rufl_fm_error->errnum, - rufl_fm_error->errmess)); + LOG("rufl_x_to_offset: 0x%x: %s", rufl_fm_error->errnum, rufl_fm_error->errmess); else - LOG(("rufl_x_to_offset: 0x%x", code)); + LOG("rufl_x_to_offset: 0x%x", code); return; } @@ -760,7 +746,7 @@ void ro_textarea_reflow(struct text_area *ta, unsigned int line) (line_count + LINE_CHUNK_SIZE) * sizeof(struct line_info)); if (!temp) { - LOG(("realloc failed")); + LOG("realloc failed"); return; } @@ -824,8 +810,7 @@ void ro_textarea_reflow(struct text_area *ta, unsigned int line) error = xwimp_set_extent(ta->window, &extent); if (error) { - LOG(("xwimp_set_extent: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_extent: 0x%x: %s", error->errnum, error->errmess); return; } @@ -842,8 +827,7 @@ void ro_textarea_reflow(struct text_area *ta, unsigned int line) error = xwimp_get_window_state_and_nesting(&state, &parent, &linkage); if (error) { - LOG(("xwimp_get_window_state_and_nesting: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state_and_nesting: 0x%x: %s", error->errnum, error->errmess); return; } @@ -856,8 +840,7 @@ void ro_textarea_reflow(struct text_area *ta, unsigned int line) state.w = ta->window; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); return; } @@ -871,8 +854,7 @@ void ro_textarea_reflow(struct text_area *ta, unsigned int line) error = xwimp_open_window_nested(PTR_WIMP_OPEN(&state), parent, linkage); if (error) { - LOG(("xwimp_open_window_nested: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window_nested: 0x%x: %s", error->errnum, error->errmess); return; } @@ -1028,8 +1010,7 @@ bool ro_textarea_key_press(wimp_key *key) (wimp_message*)&keypress, ta->parent, ta->icon, 0); if (error) { - LOG(("xwimp_send_message: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xwimp_send_message: 0x%x:%s", error->errnum, error->errmess); } break; } @@ -1080,8 +1061,7 @@ void ro_textarea_redraw_internal(wimp_draw *redraw, bool update) else error = xwimp_redraw_window(redraw, &more); if (error) { - LOG(("xwimp_redraw_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_redraw_window: 0x%x: %s", error->errnum, error->errmess); return; } @@ -1097,15 +1077,13 @@ void ro_textarea_redraw_internal(wimp_draw *redraw, bool update) colourtrans_SET_BG_GCOL | colourtrans_USE_ECFS_GCOL, os_ACTION_OVERWRITE, 0, 0); if (error) { - LOG(("xcolourtrans_set_gcol: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xcolourtrans_set_gcol: 0x%x: %s", error->errnum, error->errmess); return; } error = xos_clg(); if (error) { - LOG(("xos_clg: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xos_clg: 0x%x: %s", error->errnum, error->errmess); return; } @@ -1136,8 +1114,7 @@ void ro_textarea_redraw_internal(wimp_draw *redraw, bool update) 0xD9D9D900 : 0xFFFFFF00, 0x00000000, 14, 0, 0, 0); if (error) { - LOG(("xcolourtrans_set_font_colours: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xcolourtrans_set_font_colours: 0x%x: %s", error->errnum, error->errmess); return; } @@ -1152,18 +1129,15 @@ void ro_textarea_redraw_internal(wimp_draw *redraw, bool update) rufl_BLEND_FONT); if (code != rufl_OK) { if (code == rufl_FONT_MANAGER_ERROR) - LOG(("rufl_paint: rufl_FONT_MANAGER_ERROR: 0x%x: %s", - rufl_fm_error->errnum, - rufl_fm_error->errmess)); + LOG("rufl_paint: rufl_FONT_MANAGER_ERROR: 0x%x: %s", rufl_fm_error->errnum, rufl_fm_error->errmess); else - LOG(("rufl_paint: 0x%x", code)); + LOG("rufl_paint: 0x%x", code); } } error = xwimp_get_rectangle(redraw, &more); if (error) { - LOG(("xwimp_get_rectangle: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_rectangle: 0x%x: %s", error->errnum, error->errmess); return; } } @@ -1180,8 +1154,7 @@ void ro_textarea_open(wimp_open *open) error = xwimp_open_window(open); if (error) { - LOG(("xwimp_open_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess); return; } } diff --git a/riscos/textselection.c b/riscos/textselection.c index 1222bb490..2ee7a6949 100644 --- a/riscos/textselection.c +++ b/riscos/textselection.c @@ -91,13 +91,12 @@ void gui_start_selection(struct gui_window *g) wimp_drag drag; os_error *error; - LOG(("starting text_selection drag")); + LOG("starting text_selection drag"); state.w = g->window; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -111,8 +110,7 @@ void gui_start_selection(struct gui_window *g) error = xwimp_send_message(wimp_USER_MESSAGE, (wimp_message*)&msg, wimp_BROADCAST); if (error) { - LOG(("xwimp_send_message: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_send_message: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } owns_caret_and_selection = true; @@ -128,8 +126,7 @@ void gui_start_selection(struct gui_window *g) wimp_AUTO_SCROLL_ENABLE_HORIZONTAL, &scroll, 0); if (error) - LOG(("xwimp_auto_scroll: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_auto_scroll: 0x%x: %s", error->errnum, error->errmess); ro_mouse_drag_start(ro_gui_selection_drag_end, ro_gui_window_mouse_at, NULL, g); @@ -143,8 +140,7 @@ void gui_start_selection(struct gui_window *g) error = xwimp_drag_box(&drag); if (error) { - LOG(("xwimp_drag_box: 0x%x : %s", - error->errnum, error->errmess)); + LOG("xwimp_drag_box: 0x%x : %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } last_start_window = g; @@ -169,20 +165,17 @@ static void ro_gui_selection_drag_end(wimp_dragged *drag, void *data) scroll.w = g->window; error = xwimp_auto_scroll(0, &scroll, 0); if (error) - LOG(("xwimp_auto_scroll: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_auto_scroll: 0x%x: %s", error->errnum, error->errmess); error = xwimp_drag_box((wimp_drag*)-1); if (error) { - LOG(("xwimp_drag_box: 0x%x : %s", - error->errnum, error->errmess)); + LOG("xwimp_drag_box: 0x%x : %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } error = xwimp_get_pointer_info(&pointer); if (error) { - LOG(("xwimp_get_pointer_info 0x%x : %s", - error->errnum, error->errmess)); + LOG("xwimp_get_pointer_info 0x%x : %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -223,7 +216,7 @@ static void gui_set_clipboard(const char *buffer, size_t length, wimp_full_message_claim_entity msg; os_error *error; - LOG(("claiming clipboard")); + LOG("claiming clipboard"); msg.size = sizeof(msg); msg.your_ref = 0; @@ -233,14 +226,13 @@ static void gui_set_clipboard(const char *buffer, size_t length, error = xwimp_send_message(wimp_USER_MESSAGE, (wimp_message*)&msg, wimp_BROADCAST); if (error) { - LOG(("xwimp_send_message: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_send_message: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } owns_clipboard = true; } - LOG(("clipboard now holds %zd bytes", clip_length)); + LOG("clipboard now holds %zd bytes", clip_length); } @@ -448,7 +440,7 @@ void ro_gui_selection_claim_entity(wimp_full_message_claim_entity *claim) /* ignore our own broadcasts! */ if (claim->sender != task_handle) { - LOG(("%x", claim->flags)); + LOG("%x", claim->flags); if (claim->flags & wimp_CLAIM_CARET_OR_SELECTION) { owns_caret_and_selection = false; @@ -531,8 +523,7 @@ bool ro_gui_save_clipboard(const char *path) free(local_cb); if (error) { - LOG(("xosfile_save_stamped: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_save_stamped: 0x%x: %s", error->errnum, error->errmess); warn_user("SaveError", error->errmess); return false; } @@ -614,7 +605,7 @@ void ro_gui_selection_send_dragging(wimp_pointer *pointer) { wimp_full_message_dragging dragmsg; - LOG(("sending DRAGGING to %p, %d", pointer->w, pointer->i)); + LOG("sending DRAGGING to %p, %d", pointer->w, pointer->i); dragmsg.size = offsetof(wimp_full_message_dragging, file_types) + 8; dragmsg.your_ref = 0; diff --git a/riscos/theme.c b/riscos/theme.c index 40c374704..592fa0a7c 100644 --- a/riscos/theme.c +++ b/riscos/theme.c @@ -366,7 +366,7 @@ bool ro_gui_theme_add_descriptor(const char *folder, const char *leafname) /* create a full filename */ filename = malloc(strlen(folder) + strlen(leafname) + 2); if (!filename) { - LOG(("No memory for malloc")); + LOG("No memory for malloc"); warn_user("NoMemory", 0); return false; } @@ -376,8 +376,7 @@ bool ro_gui_theme_add_descriptor(const char *folder, const char *leafname) error = xosfind_openinw(osfind_NO_PATH, filename, 0, &file_handle); if (error) { - LOG(("xosfind_openinw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfind_openinw: 0x%x: %s", error->errnum, error->errmess); warn_user("FileError", error->errmess); free(filename); return false; @@ -392,8 +391,7 @@ bool ro_gui_theme_add_descriptor(const char *folder, const char *leafname) 0, &output_left); xosfind_closew(file_handle); if (error) { - LOG(("xosbgpb_read_atw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosbgpb_read_atw: 0x%x: %s", error->errnum, error->errmess); warn_user("FileError", error->errmess); free(filename); return false; @@ -407,7 +405,7 @@ bool ro_gui_theme_add_descriptor(const char *folder, const char *leafname) current = (struct theme_descriptor *)calloc(1, sizeof(struct theme_descriptor)); if (!current) { - LOG(("calloc failed")); + LOG("calloc failed"); warn_user("NoMemory", 0); free(filename); return false; @@ -525,7 +523,7 @@ bool ro_gui_theme_open(struct theme_descriptor *descriptor, bool list) descriptor->theme = (struct theme *)calloc(1, sizeof(struct theme)); if (!descriptor->theme) { - LOG(("calloc() failed")); + LOG("calloc() failed"); warn_user("NoMemory", 0); continue; } @@ -535,8 +533,7 @@ bool ro_gui_theme_open(struct theme_descriptor *descriptor, bool list) error = xosfile_read_stamped_no_path(descriptor->filename, &obj_type, 0, 0, &file_size, 0, 0); if (error) { - LOG(("xosfile_read_stamped_no_path: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_read_stamped_no_path: 0x%x: %s", error->errnum, error->errmess); warn_user("FileError", error->errmess); continue; } @@ -544,7 +541,7 @@ bool ro_gui_theme_open(struct theme_descriptor *descriptor, bool list) continue; raw_data = malloc(file_size); if (!raw_data) { - LOG(("malloc() failed")); + LOG("malloc() failed"); warn_user("NoMemory", 0); continue; } @@ -552,8 +549,7 @@ bool ro_gui_theme_open(struct theme_descriptor *descriptor, bool list) (byte *)raw_data, 0, 0, 0, 0, 0); if (error) { free(raw_data); - LOG(("xosfile_load_stamped_no_path: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_load_stamped_no_path: 0x%x: %s", error->errnum, error->errmess); warn_user("FileError", error->errmess); continue; } @@ -562,8 +558,7 @@ bool ro_gui_theme_open(struct theme_descriptor *descriptor, bool list) error = xsquash_decompress_return_sizes(-1, &workspace_size, 0); if (error) { free(raw_data); - LOG(("xsquash_decompress_return_sizes: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xsquash_decompress_return_sizes: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); continue; } @@ -573,7 +568,7 @@ bool ro_gui_theme_open(struct theme_descriptor *descriptor, bool list) if ((!decompressed) || (!workspace)) { free(decompressed); free(raw_data); - LOG(("malloc() failed")); + LOG("malloc() failed"); warn_user("NoMemory", 0); continue; } @@ -588,8 +583,7 @@ bool ro_gui_theme_open(struct theme_descriptor *descriptor, bool list) free(raw_data); if (error) { free(decompressed); - LOG(("xsquash_decompress: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xsquash_decompress: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); continue; } @@ -607,8 +601,7 @@ bool ro_gui_theme_open(struct theme_descriptor *descriptor, bool list) descriptor->theme->sprite_area, sprite_name, 16, i, 0); if (error) { - LOG(("xosspriteop_return_name: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosspriteop_return_name: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); continue; } @@ -623,8 +616,7 @@ bool ro_gui_theme_open(struct theme_descriptor *descriptor, bool list) &dimensions.x, &dimensions.y, (osbool *) 0, &mode); if (error) { - LOG(("xosspriteop_read_sprite_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosspriteop_read_sprite_info: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); continue; } diff --git a/riscos/theme_install.c b/riscos/theme_install.c index c161943ba..5270bd3c2 100644 --- a/riscos/theme_install.c +++ b/riscos/theme_install.c @@ -184,7 +184,7 @@ bool ro_gui_theme_install_apply(wimp_w w) /* convert spaces to hard spaces */ theme_file = strdup(theme_install_descriptor.name); if (!theme_file) { - LOG(("malloc failed")); + LOG("malloc failed"); warn_user("NoMemory", 0); return false; } @@ -205,8 +205,7 @@ bool ro_gui_theme_install_apply(wimp_w w) (byte *) source_data, (byte *) source_data + source_size); if (error) { - LOG(("xosfile_save_stamped: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_save_stamped: 0x%x: %s", error->errnum, error->errmess); warn_user("ThemeInstallErr", 0); free(theme_file); return false; diff --git a/riscos/toolbar.c b/riscos/toolbar.c index 757513c88..b6e1d917e 100644 --- a/riscos/toolbar.c +++ b/riscos/toolbar.c @@ -231,7 +231,7 @@ struct toolbar *ro_toolbar_create(struct theme_descriptor *descriptor, toolbar = calloc(sizeof(struct toolbar), 1); if (toolbar == NULL) { - LOG(("No memory for malloc()")); + LOG("No memory for malloc()"); warn_user("NoMemory", 0); return NULL; } @@ -370,8 +370,7 @@ bool ro_toolbar_rebuild(struct toolbar *toolbar) old_window = toolbar->toolbar_handle; error = xwimp_delete_window(toolbar->toolbar_handle); if (error) - LOG(("xwimp_delete_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_delete_window: 0x%x: %s", error->errnum, error->errmess); toolbar->toolbar_handle = NULL; } @@ -380,8 +379,7 @@ bool ro_toolbar_rebuild(struct toolbar *toolbar) error = xwimp_create_window(&ro_toolbar_window, &toolbar->toolbar_handle); if (error) { - LOG(("xwimp_create_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -499,8 +497,7 @@ bool ro_toolbar_rebuild(struct toolbar *toolbar) icon.icon.data.indirected_text.size = 1; error = xwimp_create_icon(&icon, &toolbar->editor_div1); if (error) { - LOG(("xwimp_create_icon: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); toolbar->editor_div1 = -1; } @@ -565,8 +562,7 @@ bool ro_toolbar_attach(struct toolbar *toolbar, wimp_w parent) wimp_CHILD_LINKS_PARENT_VISIBLE_TOP_OR_RIGHT << wimp_CHILD_TS_EDGE_SHIFT); if (error) { - LOG(("xwimp_open_window_nested: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window_nested: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -576,8 +572,7 @@ bool ro_toolbar_attach(struct toolbar *toolbar, wimp_w parent) error = xwimp_close_window(toolbar->toolbar_handle); if (error) { - LOG(("xwimp_close_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_close_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -610,8 +605,7 @@ bool ro_toolbar_process(struct toolbar *toolbar, int width, bool reformat) outline.w = toolbar->parent_handle; error = xwimp_get_window_outline(&outline); if (error) { - LOG(("xwimp_get_window_outline: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_outline: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -631,8 +625,7 @@ bool ro_toolbar_process(struct toolbar *toolbar, int width, bool reformat) state.w = toolbar->parent_handle; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -658,8 +651,7 @@ bool ro_toolbar_process(struct toolbar *toolbar, int width, bool reformat) error = xwimp_set_extent(toolbar->toolbar_handle, &extent); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -947,7 +939,7 @@ void ro_toolbar_destroy(struct toolbar *toolbar) if (toolbar == NULL) return; - LOG(("Destroying toolbar 0x%x", (unsigned int) toolbar)); + LOG("Destroying toolbar 0x%x", (unsigned int)toolbar); /* Destroy the widgets. */ @@ -1006,8 +998,7 @@ void ro_toolbar_redraw(wimp_draw *redraw) error = xwimp_redraw_window(redraw, &more); if (error) { - LOG(("xwimp_redraw_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_redraw_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1026,8 +1017,7 @@ void ro_toolbar_redraw(wimp_draw *redraw) error = xwimp_get_rectangle(redraw, &more); if (error) { - LOG(("xwimp_get_rectangle: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_rectangle: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1060,8 +1050,7 @@ bool ro_toolbar_click(wimp_pointer *pointer) state.w = toolbar->toolbar_handle; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -1340,8 +1329,7 @@ const char *ro_toolbar_get_help_suffix(wimp_w w, wimp_i i, os_coord *pos, state.w = toolbar->toolbar_handle; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return NULL; } diff --git a/riscos/treeview.c b/riscos/treeview.c index 39c601413..aa86d209c 100644 --- a/riscos/treeview.c +++ b/riscos/treeview.c @@ -311,8 +311,7 @@ void ro_treeview_redraw_request(int x, int y, int width, int height, error = xwimp_update_window(&update, &more); if (error) { - LOG(("xwimp_update_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_update_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -334,8 +333,7 @@ void ro_treeview_redraw(wimp_draw *redraw) tv = (ro_treeview *) ro_gui_wimp_event_get_user_data(redraw->w); if (tv == NULL) { - LOG(("NULL treeview block for window: 0x%x", - (unsigned int) redraw->w)); + LOG("NULL treeview block for window: 0x%x", (unsigned int)redraw->w); /* Don't return, as not servicing redraw events isn't a good * idea. The following code must handle (tv == NULL) * gracefully while clearing the redraw queue. @@ -344,8 +342,7 @@ void ro_treeview_redraw(wimp_draw *redraw) error = xwimp_redraw_window(redraw, &more); if (error) { - LOG(("xwimp_redraw_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_redraw_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -411,8 +408,7 @@ void ro_treeview_scroll(wimp_scroll *scroll) error = xwimp_open_window((wimp_open *) scroll); if (error) { - LOG(("xwimp_open_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess); } } @@ -460,8 +456,7 @@ void ro_treeview_redraw_loop(wimp_draw *redraw, ro_treeview *tv, osbool more) error = xwimp_get_rectangle(redraw, &more); if (error) { - LOG(("xwimp_redraw_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_redraw_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -514,8 +509,7 @@ void ro_treeview_scroll_visible(int y, int height, void *pw) state.w = tv->w; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -553,8 +547,7 @@ void ro_treeview_scroll_visible(int y, int height, void *pw) error = xwimp_open_window((wimp_open *) &state); if (error) { - LOG(("xwimp_open_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -581,8 +574,7 @@ void ro_treeview_get_window_dimensions(int *width, int *height, state.w = tv->w; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -624,8 +616,7 @@ void ro_treeview_set_window_extent(ro_treeview *tv, int width, int height) state.w = tv->w; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -684,8 +675,7 @@ void ro_treeview_set_window_extent(ro_treeview *tv, int width, int height) error = xwimp_open_window((wimp_open *) &state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -709,8 +699,7 @@ void ro_treeview_set_window_extent(ro_treeview *tv, int width, int height) error = xwimp_set_extent(tv->w, &extent); if (error) { - LOG(("xwimp_set_extent: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_extent: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -735,8 +724,7 @@ static void ro_treeview_open(wimp_open *open) tv = (ro_treeview *) ro_gui_wimp_event_get_user_data(open->w); if (tv == NULL) { - LOG(("NULL treeview block for window: ox%x", - (unsigned int) open->w)); + LOG("NULL treeview block for window: ox%x", (unsigned int)open->w); return; } @@ -764,8 +752,7 @@ static void ro_treeview_open(wimp_open *open) error = xwimp_set_extent(tv->w, &extent); if (error) { - LOG(("xwimp_set_extent: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_extent: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -778,8 +765,7 @@ static void ro_treeview_open(wimp_open *open) error = xwimp_open_window(open); if (error) { - LOG(("xwimp_open_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -806,16 +792,14 @@ static bool ro_treeview_mouse_click(wimp_pointer *pointer) tv = (ro_treeview *) ro_gui_wimp_event_get_user_data(pointer->w); if (tv == NULL) { - LOG(("NULL treeview block for window: 0x%x", - (unsigned int) pointer->w)); + LOG("NULL treeview block for window: 0x%x", (unsigned int)pointer->w); return false; } state.w = tv->w; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -939,8 +923,7 @@ void ro_treeview_mouse_at(wimp_pointer *pointer, void *data) tv = (ro_treeview *) ro_gui_wimp_event_get_user_data(pointer->w); if (tv == NULL) { - LOG(("NULL treeview block for window: 0x%x", - (unsigned int) pointer->w)); + LOG("NULL treeview block for window: 0x%x", (unsigned int)pointer->w); return; } @@ -954,8 +937,7 @@ void ro_treeview_mouse_at(wimp_pointer *pointer, void *data) state.w = tv->w; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1034,13 +1016,12 @@ static void ro_treeview_drag_start(ro_treeview *tv, wimp_pointer *pointer, break; } - LOG(("Drag start...")); + LOG("Drag start..."); error = xwimp_drag_box_with_flags(&drag, wimp_DRAG_BOX_KEEP_IN_LINE | wimp_DRAG_BOX_CLIP); if (error) { - LOG(("xwimp_drag_box: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_drag_box: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } else { auto_scroll.w = tv->w; @@ -1055,8 +1036,7 @@ static void ro_treeview_drag_start(ro_treeview *tv, wimp_pointer *pointer, error = xwimp_auto_scroll(wimp_AUTO_SCROLL_ENABLE_VERTICAL, &auto_scroll, NULL); if (error) { - LOG(("xwimp_auto_scroll: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_auto_scroll: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -1080,15 +1060,13 @@ static void ro_treeview_drag_end(wimp_dragged *drag, void *data) error = xwimp_drag_box((wimp_drag *) -1); if (error) { - LOG(("xwimp_drag_box: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_drag_box: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } error = xwimp_auto_scroll(0, NULL, NULL); if (error) { - LOG(("xwimp_auto_scroll: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_auto_scroll: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -1108,8 +1086,7 @@ static bool ro_treeview_keypress(wimp_key *key) tv = (ro_treeview *) ro_gui_wimp_event_get_user_data(key->w); if (tv == NULL) { - LOG(("NULL treeview block for window: 0x%x", - (unsigned int) key->w)); + LOG("NULL treeview block for window: 0x%x", (unsigned int)key->w); return false; } diff --git a/riscos/ucstables.c b/riscos/ucstables.c index e8bc25080..c881437ca 100644 --- a/riscos/ucstables.c +++ b/riscos/ucstables.c @@ -622,7 +622,7 @@ nserror utf8_from_local_encoding(const char *string, size_t len, char **result) off - prev_off, &temp, NULL); if (err != NSERROR_OK) { assert(err != NSERROR_BAD_ENCODING); - LOG(("utf8_from_enc failed")); + LOG("utf8_from_enc failed"); free(*result); return NSERROR_NOMEM; } @@ -664,7 +664,7 @@ nserror utf8_from_local_encoding(const char *string, size_t len, char **result) &temp, NULL); if (err != NSERROR_OK) { assert(err != NSERROR_BAD_ENCODING); - LOG(("utf8_from_enc failed")); + LOG("utf8_from_enc failed"); free(*result); return NSERROR_NOMEM; } @@ -679,7 +679,7 @@ nserror utf8_from_local_encoding(const char *string, size_t len, char **result) /* and copy into more reasonably-sized buffer */ temp = realloc((*result), cur_off + 1); if (!temp) { - LOG(("realloc failed")); + LOG("realloc failed"); free(*result); return NSERROR_NOMEM; } diff --git a/riscos/uri.c b/riscos/uri.c index c065a9c62..2c45d75a9 100644 --- a/riscos/uri.c +++ b/riscos/uri.c @@ -116,7 +116,7 @@ void ro_uri_bounce(wimp_message *msg) /* Get required buffer size */ e = xuri_request_uri(0, NULL, 0, message->handle, &size); if (e) { - LOG(("xuri_request_uri: %d: %s", e->errnum, e->errmess)); + LOG("xuri_request_uri: %d: %s", e->errnum, e->errmess); return; } @@ -127,7 +127,7 @@ void ro_uri_bounce(wimp_message *msg) /* Get URI */ e = xuri_request_uri(0, uri_buf, size, message->handle, 0); if (e) { - LOG(("xuri_request_uri: %d: %s", e->errnum, e->errmess)); + LOG("xuri_request_uri: %d: %s", e->errnum, e->errmess); free(uri_buf); return; } diff --git a/riscos/url_complete.c b/riscos/url_complete.c index c4d689654..3d189a01d 100644 --- a/riscos/url_complete.c +++ b/riscos/url_complete.c @@ -168,8 +168,7 @@ bool ro_gui_url_complete_keypress(struct toolbar *toolbar, uint32_t key) -(url_complete_matches_selection + 1) * 44, 65536, -url_complete_matches_selection * 44); if (error) { - LOG(("xwimp_force_redraw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_force_redraw: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -208,8 +207,7 @@ bool ro_gui_url_complete_keypress(struct toolbar *toolbar, uint32_t key) state.w = parent; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -227,9 +225,7 @@ bool ro_gui_url_complete_keypress(struct toolbar *toolbar, uint32_t key) error = xwimp_force_redraw(dialog_url_complete, 0, -(i + 1) * 44, 65536, -i * 44); if (error) { - LOG(("xwimp_force_redraw: 0x%x: %s", - error->errnum, - error->errmess)); + LOG("xwimp_force_redraw: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -282,8 +278,7 @@ bool ro_gui_url_complete_keypress(struct toolbar *toolbar, uint32_t key) 0, -(old_selection + 1) * 44, 65536, -old_selection * 44); if (error) { - LOG(("xwimp_force_redraw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_force_redraw: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -291,8 +286,7 @@ bool ro_gui_url_complete_keypress(struct toolbar *toolbar, uint32_t key) 0, -(url_complete_matches_selection + 1) * 44, 65536, -url_complete_matches_selection * 44); if (error) { - LOG(("xwimp_force_redraw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_force_redraw: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -323,8 +317,7 @@ bool ro_gui_url_complete_keypress(struct toolbar *toolbar, uint32_t key) state.w = dialog_url_complete; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return true; } @@ -339,8 +332,7 @@ bool ro_gui_url_complete_keypress(struct toolbar *toolbar, uint32_t key) error = xwimp_open_window(PTR_WIMP_OPEN(&state)); if (error) { - LOG(("xwimp_open_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return true; } @@ -416,8 +408,7 @@ void ro_gui_url_complete_resize(struct toolbar *toolbar, wimp_open *open) state.w = dialog_url_complete; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -429,14 +420,13 @@ void ro_gui_url_complete_resize(struct toolbar *toolbar, wimp_open *open) toolbar_state.w = ro_toolbar_get_window(toolbar); error = xwimp_get_window_state(&toolbar_state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } if (!ro_toolbar_get_url_field_extent(toolbar, &url_extent)) { - LOG(("Failed to read URL field extent.")); + LOG("Failed to read URL field extent."); return; } @@ -445,8 +435,7 @@ void ro_gui_url_complete_resize(struct toolbar *toolbar, wimp_open *open) extent.x1 = 65536; error = xwimp_set_extent(dialog_url_complete, &extent); if (error) { - LOG(("xwimp_set_extent: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_extent: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -468,16 +457,14 @@ void ro_gui_url_complete_resize(struct toolbar *toolbar, wimp_open *open) if (state.visible.x1 - state.visible.x0 < 0) { error = xwimp_close_window(dialog_url_complete); if (error) { - LOG(("xwimp_close_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_close_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } else { error = xwimp_open_window_nested_with_flags(&state, (wimp_w)-1, 0); if (error) { - LOG(("xwimp_open_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -517,8 +504,7 @@ bool ro_gui_url_complete_close(void) error = xwimp_close_window(dialog_url_complete); if (error) { - LOG(("xwimp_close_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_close_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -558,7 +544,7 @@ void ro_gui_url_complete_redraw(wimp_draw *redraw) /* no matches? no redraw */ if (!url_complete_matches) { - LOG(("Attempt to redraw with no matches made")); + LOG("Attempt to redraw with no matches made"); /* Fill is never used, so make it something obvious */ ro_gui_user_redraw(redraw, false, os_COLOUR_BLACK); return; @@ -593,9 +579,7 @@ void ro_gui_url_complete_redraw(wimp_draw *redraw) error = xwimp_plot_icon(&url_complete_icon); if (error) { - LOG(("xwimp_plot_icon: 0x%x: %s", - error->errnum, - error->errmess)); + LOG("xwimp_plot_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -617,9 +601,7 @@ void ro_gui_url_complete_redraw(wimp_draw *redraw) url_complete_sprite.extent.y0 = -(line + 1) * 44; error = xwimp_plot_icon(&url_complete_sprite); if (error) { - LOG(("xwimp_plot_icon: 0x%x: %s", - error->errnum, - error->errmess)); + LOG("xwimp_plot_icon: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -673,8 +655,7 @@ bool ro_gui_url_complete_click(wimp_pointer *pointer) state.w = dialog_url_complete; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -701,16 +682,14 @@ bool ro_gui_url_complete_click(wimp_pointer *pointer) 0, -(old_selection + 1) * 44, 65536, -old_selection * 44); if (error) { - LOG(("xwimp_force_redraw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_force_redraw: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } error = xwimp_force_redraw(dialog_url_complete, 0, -(url_complete_matches_selection + 1) * 44, 65536, -url_complete_matches_selection * 44); if (error) { - LOG(("xwimp_force_redraw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_force_redraw: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } diff --git a/riscos/url_protocol.c b/riscos/url_protocol.c index 6c5bdac9a..9fa888269 100644 --- a/riscos/url_protocol.c +++ b/riscos/url_protocol.c @@ -74,17 +74,17 @@ void ro_url_message_received(wimp_message *message) } else { if (!url_message->indirect.url.offset) { - LOG(("no URL in message")); + LOG("no URL in message"); return; } if (28 < message->size && url_message->indirect.body_file.offset) { - LOG(("POST for URL message not implemented")); + LOG("POST for URL message not implemented"); return; } if (url_message->indirect.url.offset < 28 || 236 <= url_message->indirect.url.offset) { - LOG(("external pointers in URL message unimplemented")); + LOG("external pointers in URL message unimplemented"); /* these messages have never been seen in the wild, * and there is the problem of invalid addresses which * would cause an abort */ @@ -121,8 +121,7 @@ void ro_url_message_received(wimp_message *message) error = xwimp_send_message(wimp_USER_MESSAGE_ACKNOWLEDGE, message, message->sender); if (error) { - LOG(("xwimp_send_message: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_send_message: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -165,8 +164,7 @@ void ro_url_broadcast(const char *url) error = xwimp_send_message(wimp_USER_MESSAGE_RECORDED, (wimp_message *) &message, 0); if (error) { - LOG(("xwimp_send_message: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_send_message: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -185,7 +183,7 @@ void ro_url_load(const char *url) colon = strchr(url, ':'); if (!colon) { - LOG(("invalid url '%s'", url)); + LOG("invalid url '%s'", url); return; } @@ -205,8 +203,7 @@ void ro_url_load(const char *url) error = xwimp_start_task(command, 0); if (error) { - LOG(("xwimp_start_task: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_start_task: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } diff --git a/riscos/wimp.c b/riscos/wimp.c index db6c2dbbb..93fedc3dc 100644 --- a/riscos/wimp.c +++ b/riscos/wimp.c @@ -104,8 +104,7 @@ void ro_gui_wimp_cache_furniture_sizes(wimp_w w) furniture_sizes.border_widths.x1 = 40; error = xwimpextend_get_furniture_sizes(&furniture_sizes); if (error) { - LOG(("xwimpextend_get_furniture_sizes: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimpextend_get_furniture_sizes: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -125,15 +124,13 @@ bool ro_gui_wimp_read_eig_factors(os_mode mode, int *xeig, int *yeig) error = xos_read_mode_variable(mode, os_MODEVAR_XEIG_FACTOR, xeig, 0); if (error) { - LOG(("xos_read_mode_variable: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xos_read_mode_variable: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); return false; } error = xos_read_mode_variable(mode, os_MODEVAR_YEIG_FACTOR, yeig, 0); if (error) { - LOG(("xos_read_mode_variable: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xos_read_mode_variable: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); return false; } @@ -200,16 +197,14 @@ void ro_gui_force_redraw_icon(wimp_w w, wimp_i i) ic.i = i; error = xwimp_get_icon_state(&ic); if (error) { - LOG(("xwimp_get_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } error = xwimp_force_redraw(w, ic.icon.extent.x0, ic.icon.extent.y0, ic.icon.extent.x1, ic.icon.extent.y1); if (error) { - LOG(("xwimp_force_redraw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_force_redraw: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -241,8 +236,7 @@ const char *ro_gui_get_icon_string(wimp_w w, wimp_i i) ic.i = i; error = xwimp_get_icon_state(&ic); if (error) { - LOG(("xwimp_get_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return NULL; } @@ -284,7 +278,7 @@ void ro_gui_set_icon_string(wimp_w w, wimp_i i, const char *text, bool is_utf8) if (err != NSERROR_OK) { /* A bad encoding should never happen, so assert this */ assert(err != NSERROR_BAD_ENCODING); - LOG(("utf8_to_enc failed")); + LOG("utf8_to_enc failed"); /* Paranoia */ local_text = NULL; } @@ -299,8 +293,7 @@ void ro_gui_set_icon_string(wimp_w w, wimp_i i, const char *text, bool is_utf8) ic.i = i; error = xwimp_get_icon_state(&ic); if (error) { - LOG(("xwimp_get_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); goto exit; } @@ -333,8 +326,7 @@ void ro_gui_set_icon_string(wimp_w w, wimp_i i, const char *text, bool is_utf8) (button_type == wimp_BUTTON_WRITE_CLICK_DRAG)) { error = xwimp_get_caret_position(&caret); if (error) { - LOG(("xwimp_get_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); goto exit; } @@ -345,8 +337,7 @@ void ro_gui_set_icon_string(wimp_w w, wimp_i i, const char *text, bool is_utf8) error = xwimp_set_caret_position(w, i, caret.pos.x, caret.pos.y, -1, caret.index); if (error) { - LOG(("xwimp_set_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -455,8 +446,7 @@ void ro_gui_set_icon_selected_state(wimp_w w, wimp_i i, bool state) error = xwimp_set_icon_state(w, i, (state ? wimp_ICON_SELECTED : 0), wimp_ICON_SELECTED); if (error) { - LOG(("xwimp_set_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -475,8 +465,7 @@ bool ro_gui_get_icon_selected_state(wimp_w w, wimp_i i) ic.i = i; error = xwimp_get_icon_state(&ic); if (error) { - LOG(("xwimp_get_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -502,8 +491,7 @@ void ro_gui_set_icon_shaded_state(wimp_w w, wimp_i i, bool state) error = xwimp_set_icon_state(w, i, (state ? wimp_ICON_SHADED : 0), wimp_ICON_SHADED); if (error) { - LOG(("xwimp_get_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } if (!state) @@ -512,8 +500,7 @@ void ro_gui_set_icon_shaded_state(wimp_w w, wimp_i i, bool state) /* ensure the caret is not in a shaded icon */ error = xwimp_get_caret_position(&caret); if (error) { - LOG(("xwimp_get_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -525,8 +512,7 @@ void ro_gui_set_icon_shaded_state(wimp_w w, wimp_i i, bool state) /* lose the caret */ error = xwimp_set_caret_position((wimp_w)-1, (wimp_i)-1, -1, -1, -1, -1); if (error) { - LOG(("xwimp_set_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -567,8 +553,7 @@ void ro_gui_set_icon_deleted_state(wimp_w w, wimp_i i, bool state) error = xwimp_set_icon_state(w, i, (state ? wimp_ICON_DELETED : 0), wimp_ICON_DELETED); if (error) { - LOG(("xwimp_get_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } if (!state) @@ -577,8 +562,7 @@ void ro_gui_set_icon_deleted_state(wimp_w w, wimp_i i, bool state) /* ensure the caret is not in a shaded icon */ error = xwimp_get_caret_position(&caret); if (error) { - LOG(("xwimp_get_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -590,8 +574,7 @@ void ro_gui_set_icon_deleted_state(wimp_w w, wimp_i i, bool state) /* lose the caret */ error = xwimp_set_caret_position((wimp_w)-1, (wimp_i)-1, -1, -1, -1, -1); if (error) { - LOG(("xwimp_set_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -627,8 +610,7 @@ void ro_gui_set_icon_button_type(wimp_w w, wimp_i i, int type) error = xwimp_set_icon_state(w, i, wimp_ICON_BUTTON_TYPE, (type << wimp_ICON_BUTTON_TYPE_SHIFT)); if (error) { - LOG(("xwimp_set_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -653,8 +635,7 @@ void ro_gui_set_icon_sprite(wimp_w w, wimp_i i, osspriteop_area *area, ic.i = i; error = xwimp_get_icon_state(&ic); if (error) { - LOG(("xwimp_get_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -691,8 +672,7 @@ void ro_gui_set_window_title(wimp_w w, const char *text) window.w = w; error = xwimp_get_window_info_header_only((wimp_window_info *)&window); if (error) { - LOG(("xwimp_get_window_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_info: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -703,7 +683,7 @@ void ro_gui_set_window_title(wimp_w w, const char *text) /* A bad encoding should never happen, * so assert this */ assert(err != NSERROR_BAD_ENCODING); - LOG(("utf8_to_enc failed")); + LOG("utf8_to_enc failed"); return; } @@ -719,8 +699,7 @@ void ro_gui_set_window_title(wimp_w w, const char *text) */ error = xwimp_force_redraw_title(w); if (error) { - LOG(("xwimp_force_redraw_title: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_force_redraw_title: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -747,8 +726,7 @@ bool ro_gui_set_caret_first(wimp_w w) win_state.w = w; error = xwimp_get_window_state(&win_state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -759,8 +737,7 @@ bool ro_gui_set_caret_first(wimp_w w) window.w = w; error = xwimp_get_window_info_header_only((wimp_window_info *)&window); if (error) { - LOG(("xwimp_get_window_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_info: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -771,8 +748,7 @@ bool ro_gui_set_caret_first(wimp_w w) state.i = icon; error = xwimp_get_icon_state(&state); if (error) { - LOG(("xwimp_get_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -789,8 +765,7 @@ bool ro_gui_set_caret_first(wimp_w w) error = xwimp_set_caret_position(w, icon, 0, 0, -1, strlen(state.icon.data.indirected_text.text)); if (error) { - LOG(("xwimp_set_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } return true; @@ -816,8 +791,7 @@ osspriteop_area *ro_gui_load_sprite_file(const char *pathname) error = xosfile_read_stamped_no_path(pathname, &obj_type, 0, 0, &len, 0, 0); if (error) { - LOG(("xosfile_read_stamped_no_path: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosfile_read_stamped_no_path: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); return 0; } @@ -840,8 +814,7 @@ osspriteop_area *ro_gui_load_sprite_file(const char *pathname) error = xosspriteop_load_sprite_file(osspriteop_USER_AREA, area, pathname); if (error) { - LOG(("xosspriteop_load_sprite_file: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosspriteop_load_sprite_file: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); free(area); return 0; @@ -871,8 +844,7 @@ bool ro_gui_wimp_sprite_exists(const char *sprite) error = xwimpspriteop_select_sprite(sprite, 0); if (error) { if (error->errnum != error_SPRITE_OP_DOESNT_EXIST) { - LOG(("xwimpspriteop_select_sprite: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimpspriteop_select_sprite: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); } return false; @@ -945,8 +917,7 @@ bool ro_gui_wimp_get_sprite_dimensions(osspriteop_area *area, char *sprite, if (height != NULL) *height = dimensions.y; } else if (error->errnum != error_SPRITE_OP_DOESNT_EXIST) { - LOG(("xosspriteop_read_sprite_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosspriteop_read_sprite_info: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); return false; } @@ -971,8 +942,7 @@ void ro_gui_user_redraw(wimp_draw *redraw, bool user_fill, error = xwimp_redraw_window(redraw, &more); if (error) { - LOG(("xwimp_redraw_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_redraw_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -982,16 +952,14 @@ void ro_gui_user_redraw(wimp_draw *redraw, bool user_fill, colourtrans_SET_BG_GCOL, os_ACTION_OVERWRITE, 0, 0); if (error) { - LOG(("xcolourtrans_set_gcol: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xcolourtrans_set_gcol: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); } os_clg(); } error = xwimp_get_rectangle(redraw, &more); if (error) { - LOG(("xwimp_get_rectangle: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_rectangle: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1018,8 +986,7 @@ void ro_gui_wimp_update_window_furniture(wimp_w w, wimp_window_flags bic_mask, state.w = w; error = xwimp_get_window_state_and_nesting(&state, &parent, &linkage); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1032,8 +999,7 @@ void ro_gui_wimp_update_window_furniture(wimp_w w, wimp_window_flags bic_mask, state.next = wimp_HIDDEN; error = xwimp_open_window_nested_with_flags(&state, parent, linkage); if (error) { - LOG(("xwimp_open_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1041,8 +1007,7 @@ void ro_gui_wimp_update_window_furniture(wimp_w w, wimp_window_flags bic_mask, if (!open) { error = xwimp_close_window(w); if (error) { - LOG(("xwimp_close_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_close_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1064,8 +1029,7 @@ bool ro_gui_wimp_check_window_furniture(wimp_w w, wimp_window_flags mask) state.w = w; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -1165,8 +1129,7 @@ void ro_gui_scroll(wimp_scroll *scroll) error = xwimp_open_window((wimp_open *) scroll); if (error) { - LOG(("xwimp_open_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess); } } diff --git a/riscos/wimp_event.c b/riscos/wimp_event.c index 38f9b3d37..4951fb9bd 100644 --- a/riscos/wimp_event.c +++ b/riscos/wimp_event.c @@ -157,7 +157,7 @@ bool ro_gui_wimp_event_memorise(wimp_w w) ro_gui_get_icon_string(window->w, event->i)); if (!event->previous_value.textual) { error = true; - LOG(("Unable to store state for icon %i", event->i)); + LOG("Unable to store state for icon %i", event->i); } break; case EVENT_CHECKBOX: @@ -268,8 +268,7 @@ bool ro_gui_wimp_event_transfer(wimp_w from, wimp_w to) struct event_window *window; int h; - LOG(("Transferring all events from window 0x%x to window 0x%x", - (unsigned int) from, (unsigned int) to)); + LOG("Transferring all events from window 0x%x to window 0x%x", (unsigned int)from, (unsigned int)to); window = ro_gui_wimp_event_remove_window(from); if (window == NULL || window->w != from) @@ -295,7 +294,7 @@ void ro_gui_wimp_event_finalise(wimp_w w) struct event_window *window; struct icon_event *event; - LOG(("Removing all events for window 0x%x", (unsigned int)w)); + LOG("Removing all events for window 0x%x", (unsigned int)w); window = ro_gui_wimp_event_remove_window(w); if (!window) return; @@ -332,8 +331,7 @@ void ro_gui_wimp_event_deregister(wimp_w w, wimp_i i) struct event_window *window; struct icon_event *event, *parent, *child; - LOG(("Removing all events for window 0x%x, icon %d", - (unsigned int)w, (int)i)); + LOG("Removing all events for window 0x%x, icon %d", (unsigned int)w, (int)i); window = ro_gui_wimp_event_get_window(w); if (!window) return; @@ -347,7 +345,7 @@ void ro_gui_wimp_event_deregister(wimp_w w, wimp_i i) child = event->next; if (event->i == i) { - LOG(("Removing event 0x%x", (unsigned int) event)); + LOG("Removing event 0x%x", (unsigned int)event); if (parent == NULL) window->first = child; @@ -579,8 +577,7 @@ bool ro_gui_wimp_event_menu_selection(wimp_w w, wimp_i i, wimp_menu *menu, ic.i = event->data.menu_gright.field; error = xwimp_get_icon_state(&ic); if (error) { - LOG(("xwimp_get_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -590,8 +587,7 @@ bool ro_gui_wimp_event_menu_selection(wimp_w w, wimp_i i, wimp_menu *menu, return prepared; error = xwimp_get_caret_position(&caret); if (error) { - LOG(("xwimp_get_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -599,8 +595,7 @@ bool ro_gui_wimp_event_menu_selection(wimp_w w, wimp_i i, wimp_menu *menu, error = xwimp_set_caret_position(window->w, event->data.menu_gright.field, -1, -1, -1, strlen(menu_entry->data.indirected_text.text)); if (error) { - LOG(("xwimp_set_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -672,7 +667,7 @@ bool ro_gui_wimp_event_mouse_click(wimp_pointer *pointer) for (search = window->first; search; search = search->next) if (search->i == event->data.linked_icon) break; if (!search) { - LOG(("Incorrect reference.")); + LOG("Incorrect reference."); return false; } stepping = search->data.numeric_field.stepping; @@ -709,15 +704,13 @@ bool ro_gui_wimp_event_mouse_click(wimp_pointer *pointer) open.w = pointer->w; error = xwimp_get_window_state(&open); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } error = xwimp_get_caret_position(&caret); if (error) { - LOG(("xwimp_get_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -726,8 +719,7 @@ bool ro_gui_wimp_event_mouse_click(wimp_pointer *pointer) ro_gui_menu_destroy(); error = xwimp_open_window(PTR_WIMP_OPEN(&open)); if (error) { - LOG(("xwimp_open_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -737,8 +729,7 @@ bool ro_gui_wimp_event_mouse_click(wimp_pointer *pointer) caret.pos.x, caret.pos.y, -1, caret.index); if (error) { - LOG(("xwimp_set_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -806,8 +797,7 @@ void ro_gui_wimp_event_prepare_gright_menu(wimp_w w, struct icon_event *event) ic.i = event->data.menu_gright.field; error = xwimp_get_icon_state(&ic); if (error) { - LOG(("xwimp_get_icon_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_icon_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -914,8 +904,7 @@ bool ro_gui_wimp_event_keypress(wimp_key *key) */ error = xosbyte1(osbyte_ALPHABET_NUMBER, 127, 0, &t_alphabet); if (error) { - LOG(("failed reading alphabet: 0x%x: %s", - error->errnum, error->errmess)); + LOG("failed reading alphabet: 0x%x: %s", error->errnum, error->errmess); /* prevent any corruption of ucstable */ t_alphabet = alphabet; } @@ -929,8 +918,7 @@ bool ro_gui_wimp_event_keypress(wimp_key *key) error = xserviceinternational_get_ucs_conversion_table( alphabet, &unclaimed, &ostable); if (error != NULL) { - LOG(("failed reading UCS conversion table: 0x%x: %s", - error->errnum, error->errmess)); + LOG("failed reading UCS conversion table: 0x%x: %s", error->errnum, error->errmess); /* Try using our own table instead */ ucstable = ucstable_from_alphabet(alphabet); } else if (unclaimed) { @@ -987,9 +975,7 @@ bool ro_gui_wimp_event_keypress(wimp_key *key) /* If this ever happens, * RISC OS' UTF8 keyboard * drivers are broken */ - LOG(("unexpected UTF8 start" - " byte %x (ignoring)", - c)); + LOG("unexpected UTF8 start"" byte %x (ignoring)", c); return true; } /* Anything else is ASCII, so just @@ -1000,8 +986,7 @@ bool ro_gui_wimp_event_keypress(wimp_key *key) /* If this ever happens, * RISC OS' UTF8 keyboard * drivers are broken */ - LOG(("unexpected keycode: " - "%x (ignoring)", c)); + LOG("unexpected keycode: ""%x (ignoring)", c); return true; } @@ -1090,7 +1075,7 @@ bool ro_gui_wimp_event_close_window(wimp_w w) { struct event_window *window; - LOG(("Close event received for window 0x%x", (unsigned int)w)); + LOG("Close event received for window 0x%x", (unsigned int)w); if (w == ro_gui_wimp_event_submenu) ro_gui_wimp_event_submenu = 0; window = ro_gui_wimp_event_find_window(w); @@ -1631,7 +1616,7 @@ struct event_window *ro_gui_wimp_event_get_window(wimp_w w) if (window) return window; - LOG(("Creating structure for window 0x%x", (unsigned int)w)); + LOG("Creating structure for window 0x%x", (unsigned int)w); window = calloc(1, sizeof(struct event_window)); if (!window) return NULL; diff --git a/riscos/window.c b/riscos/window.c index 7f80bc8c9..097ab9ee6 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -386,8 +386,7 @@ static void gui_window_place_caret(struct gui_window *g, int x, int y, int heigh error = xwimp_set_caret_position(g->window, -1, x * 2, -(y + height) * 2, height * 2, -1); if (error) { - LOG(("xwimp_set_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -436,8 +435,7 @@ static struct gui_window *gui_window_create(struct browser_window *bw, state.w = existing->window; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } window.visible.x0 = state.visible.x0; @@ -541,8 +539,7 @@ static struct gui_window *gui_window_create(struct browser_window *bw, error = xwimp_create_window(&window, &g->window); if (error) { - LOG(("xwimp_create_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_create_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); free(g); return 0; @@ -603,8 +600,7 @@ static struct gui_window *gui_window_create(struct browser_window *bw, state.w = g->window; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return g; } @@ -663,8 +659,7 @@ static void gui_window_destroy(struct gui_window *g) /* delete window */ error = xwimp_delete_window(w); if (error) { - LOG(("xwimp_delete_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_delete_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } ro_gui_wimp_event_finalise(w); @@ -716,16 +711,14 @@ void gui_window_redraw_window(struct gui_window *g) info.w = g->window; error = xwimp_get_window_info_header_only(&info); if (error) { - LOG(("xwimp_get_window_info_header_only: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_info_header_only: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } error = xwimp_force_redraw(g->window, info.extent.x0, info.extent.y0, info.extent.x1, info.extent.y1); if (error) { - LOG(("xwimp_force_redraw: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_force_redraw: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -769,7 +762,7 @@ static void gui_window_update_box(struct gui_window *g, const struct rect *rect) } cur = malloc(sizeof(struct update_box)); if (!cur) { - LOG(("No memory for malloc.")); + LOG("No memory for malloc."); warn_user("NoMemory", 0); return; } @@ -804,8 +797,7 @@ static bool gui_window_get_scroll(struct gui_window *g, int *sx, int *sy) state.w = g->window; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -836,8 +828,7 @@ static void gui_window_set_scroll(struct gui_window *g, int sx, int sy) state.w = g->window; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -873,8 +864,7 @@ static void gui_window_scroll_visible(struct gui_window *g, int x0, int y0, int state.w = g->window; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -972,8 +962,7 @@ static void gui_window_update_extent(struct gui_window *g) info.w = g->window; error = xwimp_get_window_info_header_only(&info); if (error) { - LOG(("xwimp_get_window_info_header_only: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_info_header_only: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1027,8 +1016,7 @@ void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape) error = xwimpspriteop_set_pointer_shape(entry->sprite_name, 1, entry->xactive, entry->yactive, 0, 0); if (error) { - LOG(("xwimpspriteop_set_pointer_shape: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimpspriteop_set_pointer_shape: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } else { @@ -1038,8 +1026,7 @@ void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape) (osspriteop_id) entry->sprite_name, 1, entry->xactive, entry->yactive, 0, 0); if (error) { - LOG(("xosspriteop_set_pointer_shape: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosspriteop_set_pointer_shape: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -1119,8 +1106,7 @@ static void gui_window_remove_caret(struct gui_window *g) error = xwimp_get_caret_position(&caret); if (error) { - LOG(("xwimp_get_caret_position: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_caret_position: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1166,8 +1152,7 @@ static bool gui_window_scroll_start(struct gui_window *g) error = xwimp_get_pointer_info(&pointer); if (error) { - LOG(("xwimp_get_pointer_info 0x%x : %s", - error->errnum, error->errmess)); + LOG("xwimp_get_pointer_info 0x%x : %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -1175,8 +1160,7 @@ static bool gui_window_scroll_start(struct gui_window *g) info.w = g->window; error = xwimp_get_window_info_header_only((wimp_window_info*)&info); if (error) { - LOG(("xwimp_get_window_state: 0x%x : %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x : %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -1198,8 +1182,7 @@ static bool gui_window_scroll_start(struct gui_window *g) error = xwimp_drag_box(&drag); if (error) { - LOG(("xwimp_drag_box: 0x%x : %s", - error->errnum, error->errmess)); + LOG("xwimp_drag_box: 0x%x : %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -1230,8 +1213,7 @@ static bool gui_window_drag_start(struct gui_window *g, gui_drag_type type, * duration */ os_error *error = xwimp_get_pointer_info(&pointer); if (error) { - LOG(("xwimp_get_pointer_info 0x%x : %s", - error->errnum, error->errmess)); + LOG("xwimp_get_pointer_info 0x%x : %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -1248,8 +1230,7 @@ static bool gui_window_drag_start(struct gui_window *g, gui_drag_type type, error = xwimp_drag_box(&drag); if (error) { - LOG(("xwimp_drag_box: 0x%x : %s", - error->errnum, error->errmess)); + LOG("xwimp_drag_box: 0x%x : %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -1310,8 +1291,7 @@ void gui_window_set_extent(struct gui_window *g, int width, int height) state.w = g->window; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1342,8 +1322,7 @@ void gui_window_set_extent(struct gui_window *g, int width, int height) os_box extent = { 0, -height, width, toolbar_height }; error = xwimp_set_extent(g->window, &extent); if (error) { - LOG(("xwimp_set_extent: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_extent: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1374,8 +1353,7 @@ static void gui_window_create_form_select_menu(struct gui_window *g, error = xwimp_get_pointer_info(&pointer); if (error) { - LOG(("xwimp_get_pointer_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_pointer_info: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); ro_gui_menu_destroy(); return; @@ -1417,8 +1395,7 @@ void ro_gui_window_redraw(wimp_draw *redraw) error = xwimp_redraw_window(redraw, &more); if (error) { - LOG(("xwimp_redraw_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_redraw_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1460,8 +1437,7 @@ void ro_gui_window_redraw(wimp_draw *redraw) if (error && !(ro_gui_current_redraw_gui-> option.buffer_everything && error->errnum == error_WIMP_GET_RECT)) { - LOG(("xwimp_get_rectangle: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_rectangle: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); ro_gui_current_redraw_gui = NULL; return; @@ -1512,8 +1488,7 @@ void ro_gui_window_open(wimp_open *open) state.w = g->window; error = xwimp_get_window_state_and_nesting(&state, &parent, &linkage); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1618,8 +1593,7 @@ void ro_gui_window_open(wimp_open *open) error = xwimp_open_window_nested_with_flags(&state, parent, linkage); if (error) { - LOG(("xwimp_open_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1658,8 +1632,7 @@ void ro_gui_window_close(wimp_w w) error = xwimp_get_pointer_info(&pointer); if (error) { - LOG(("xwimp_get_pointer_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_pointer_info: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1687,9 +1660,7 @@ void ro_gui_window_close(wimp_w w) } error = xos_cli(temp_name); if (error) { - LOG(("xos_cli: 0x%x: %s", - error->errnum, - error->errmess)); + LOG("xos_cli: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); return; } @@ -1879,8 +1850,7 @@ bool ro_gui_window_handle_local_keypress(struct gui_window *g, wimp_key *key, ro_error = xwimp_get_pointer_info(&pointer); if (ro_error) { - LOG(("xwimp_get_pointer_info: 0x%x: %s\n", - ro_error->errnum, ro_error->errmess)); + LOG("xwimp_get_pointer_info: 0x%x: %s\n", ro_error->errnum, ro_error->errmess); warn_user("WimpError", ro_error->errmess); return false; } @@ -2963,9 +2933,7 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu, state.w = w; oserror = xwimp_get_window_state(&state); if (oserror) { - LOG(("xwimp_get_window_state: 0x%x: %s", - oserror->errnum, - oserror->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", oserror->errnum, oserror->errmess); warn_user("WimpError", oserror->errmess); } nsoption_set_int(window_x, state.visible.x0); @@ -3155,8 +3123,7 @@ void ro_gui_window_scroll_action(struct gui_window *g, state.w = g->window; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); return; } @@ -3170,8 +3137,7 @@ void ro_gui_window_scroll_action(struct gui_window *g, error = xwimp_get_pointer_info(&pointer); if (error) { - LOG(("xwimp_get_pointer_info 0x%x : %s", - error->errnum, error->errmess)); + LOG("xwimp_get_pointer_info 0x%x : %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -3291,9 +3257,7 @@ void ro_gui_window_scroll_action(struct gui_window *g, error = xwimp_open_window((wimp_open *) &state); if (error) { - LOG(("xwimp_open_window: 0x%x: %s", - error->errnum, - error->errmess)); + LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess); } } } @@ -3331,8 +3295,7 @@ bool ro_gui_window_dataload(struct gui_window *g, wimp_message *message) message->your_ref = message->my_ref; error = xwimp_send_message(wimp_USER_MESSAGE, message, message->sender); if (error) { - LOG(("xwimp_send_message: 0x%x: %s\n", - error->errnum, error->errmess)); + LOG("xwimp_send_message: 0x%x: %s\n", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -3398,13 +3361,12 @@ void ro_gui_window_iconise(struct gui_window *g, (osspriteop_id)overlay, &width, &height, NULL, NULL); if (error) { - LOG(("xosspriteop_read_sprite_info: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xosspriteop_read_sprite_info: 0x%x: %s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); overlay = NULL; } else if (sprite_bpp(overlay) != 8) { - LOG(("overlay sprite is not 8bpp")); + LOG("overlay sprite is not 8bpp"); overlay = NULL; } } @@ -3413,7 +3375,7 @@ void ro_gui_window_iconise(struct gui_window *g, bitmap = riscos_bitmap_create(width, height, BITMAP_NEW | BITMAP_OPAQUE | BITMAP_CLEAR_MEMORY); if (!bitmap) { - LOG(("Thumbnail initialisation failed.")); + LOG("Thumbnail initialisation failed."); return; } riscos_bitmap_render(bitmap, h); @@ -3423,7 +3385,7 @@ void ro_gui_window_iconise(struct gui_window *g, area = riscos_bitmap_convert_8bpp(bitmap); riscos_bitmap_destroy(bitmap); if (!area) { - LOG(("Thumbnail conversion failed.")); + LOG("Thumbnail conversion failed."); return; } @@ -3444,8 +3406,7 @@ void ro_gui_window_iconise(struct gui_window *g, error = xosspriteop_save_sprite_file(osspriteop_USER_AREA, area, temp_fname); if (error) { - LOG(("xosspriteop_save_sprite_file: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xosspriteop_save_sprite_file: 0x%x:%s", error->errnum, error->errmess); warn_user("MiscError", error->errmess); free(area); return; @@ -3453,8 +3414,7 @@ void ro_gui_window_iconise(struct gui_window *g, error = xwimpspriteop_merge_sprite_file(temp_fname); if (error) { - LOG(("xwimpspriteop_merge_sprite_file: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xwimpspriteop_merge_sprite_file: 0x%x:%s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); remove(temp_fname); free(area); @@ -3479,8 +3439,7 @@ void ro_gui_window_iconise(struct gui_window *g, error = xwimp_send_message(wimp_USER_MESSAGE, (wimp_message*)wi, wi->sender); if (error) { - LOG(("xwimp_send_message: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xwimp_send_message: 0x%x:%s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } else { @@ -3511,23 +3470,20 @@ static void ro_gui_window_scroll_end(wimp_dragged *drag, void *data) error = xwimp_drag_box((wimp_drag*)-1); if (error) { - LOG(("xwimp_drag_box: 0x%x : %s", - error->errnum, error->errmess)); + LOG("xwimp_drag_box: 0x%x : %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } error = xwimp_get_pointer_info(&pointer); if (error) { - LOG(("xwimp_get_pointer_info 0x%x : %s", - error->errnum, error->errmess)); + LOG("xwimp_get_pointer_info 0x%x : %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } error = xwimpspriteop_set_pointer_shape("ptr_default", 0x31, 0, 0, 0, 0); if (error) { - LOG(("xwimpspriteop_set_pointer_shape: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimpspriteop_set_pointer_shape: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -3720,8 +3676,7 @@ bool ro_gui_toolbar_dataload(struct gui_window *g, wimp_message *message) error = xwimp_send_message(wimp_USER_MESSAGE, message, message->sender); if (error) { - LOG(("xwimp_send_message: 0x%x: %s\n", - error->errnum, error->errmess)); + LOG("xwimp_send_message: 0x%x: %s\n", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } return true; @@ -4192,8 +4147,7 @@ void ro_gui_window_update_boxes(void) error = xwimp_update_window(&update, &more); if (error) { - LOG(("xwimp_update_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_update_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); continue; } @@ -4226,8 +4180,7 @@ void ro_gui_window_update_boxes(void) * found. This appears to be a bug in RISC OS. */ if (error && !(use_buffer && error->errnum == error_WIMP_GET_RECT)) { - LOG(("xwimp_get_rectangle: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_rectangle: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); ro_gui_current_redraw_gui = NULL; continue; @@ -4420,8 +4373,7 @@ bool ro_gui_window_import_text(struct gui_window *g, const char *filename) error = xosfile_read_stamped(filename, &obj_type, NULL, NULL, &size, NULL, NULL); if (error) { - LOG(("xosfile_read_stamped: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xosfile_read_stamped: 0x%x:%s", error->errnum, error->errmess); warn_user("FileError", error->errmess); return true; /* was for us, but it didn't work! */ } @@ -4440,8 +4392,7 @@ bool ro_gui_window_import_text(struct gui_window *g, const char *filename) NULL, NULL, NULL, NULL, NULL); if (error) { - LOG(("xosfile_load_stamped: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xosfile_load_stamped: 0x%x:%s", error->errnum, error->errmess); warn_user("LoadError", error->errmess); free(buf); return true; @@ -4451,7 +4402,7 @@ bool ro_gui_window_import_text(struct gui_window *g, const char *filename) if (ret != NSERROR_OK) { /* bad encoding shouldn't happen */ assert(ret != NSERROR_BAD_ENCODING); - LOG(("utf8_from_local_encoding failed")); + LOG("utf8_from_local_encoding failed"); free(buf); warn_user("NoMemory", NULL); return true; @@ -4624,7 +4575,7 @@ bool ro_gui_window_prepare_form_select_menu(struct gui_window *g, if (err != NSERROR_OK) { /* badenc should never happen */ assert(err != NSERROR_BAD_ENCODING); - LOG(("utf8_to_local_encoding failed")); + LOG("utf8_to_local_encoding failed"); warn_user("NoMemory", 0); ro_gui_menu_destroy(); return false; @@ -4650,7 +4601,7 @@ bool ro_gui_window_prepare_form_select_menu(struct gui_window *g, temp = cnv_space2nbsp(option->text); if (!temp) { - LOG(("cnv_space2nbsp failed")); + LOG("cnv_space2nbsp failed"); warn_user("NoMemory", 0); ro_gui_menu_destroy(); return false; @@ -4662,7 +4613,7 @@ bool ro_gui_window_prepare_form_select_menu(struct gui_window *g, /* A bad encoding should never happen, * so assert this */ assert(err != NSERROR_BAD_ENCODING); - LOG(("utf8_to_enc failed")); + LOG("utf8_to_enc failed"); warn_user("NoMemory", 0); ro_gui_menu_destroy(); return false; @@ -4773,8 +4724,7 @@ bool ro_gui_window_to_window_pos(struct gui_window *g, int x, int y, state.w = g->window; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x:%s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -4805,8 +4755,7 @@ bool ro_gui_window_to_screen_pos(struct gui_window *g, int x, int y, state.w = g->window; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x:%s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x:%s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } |