diff options
Diffstat (limited to 'riscos/save.c')
-rw-r--r-- | riscos/save.c | 85 |
1 files changed, 31 insertions, 54 deletions
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; } |