From 2b1a63aef32b138cf72daf94f1dcfac3c12b53e2 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 8 Sep 2024 11:42:37 +0300 Subject: [PATCH] (file_progress_show_count): remove 'done' and 'total' arguments. Use members of 'ctx' instead. Signed-off-by: Andrew Borodin --- src/filemanager/file.c | 14 +++++++------- src/filemanager/filegui.c | 9 +++++---- src/filemanager/filegui.h | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/filemanager/file.c b/src/filemanager/file.c index dc8f0cef6..cebbee13b 100644 --- a/src/filemanager/file.c +++ b/src/filemanager/file.c @@ -830,7 +830,7 @@ progress_update_one (file_op_context_t *ctx, off_t add) { if (verbose && ctx->dialog_type == FILEGUI_DIALOG_MULTI_ITEM) { - file_progress_show_count (ctx, ctx->total_progress_count, ctx->total_count); + file_progress_show_count (ctx); file_progress_show_total (ctx, ctx->progress_bytes, TRUE); } @@ -1374,7 +1374,7 @@ erase_file (file_op_context_t *ctx, const vfs_path_t *vpath) /* check buttons if deleting info was changed */ if (file_progress_show_deleting (ctx, vpath, &ctx->total_progress_count)) { - file_progress_show_count (ctx, ctx->total_progress_count, ctx->total_count); + file_progress_show_count (ctx); if (file_progress_check_buttons (ctx) == FILE_ABORT) return FILE_ABORT; @@ -1464,7 +1464,7 @@ recursive_erase (file_op_context_t *ctx, const vfs_path_t *vpath) return FILE_ABORT; file_progress_show_deleting (ctx, vpath, NULL); - file_progress_show_count (ctx, ctx->total_progress_count, ctx->total_count); + file_progress_show_count (ctx); if (file_progress_check_buttons (ctx) == FILE_ABORT) return FILE_ABORT; @@ -1515,7 +1515,7 @@ static FileProgressStatus erase_dir_iff_empty (file_op_context_t *ctx, const vfs_path_t *vpath) { file_progress_show_deleting (ctx, vpath, NULL); - file_progress_show_count (ctx, ctx->total_progress_count, ctx->total_count); + file_progress_show_count (ctx); if (file_progress_check_buttons (ctx) == FILE_ABORT) return FILE_ABORT; @@ -2758,7 +2758,7 @@ copy_file_file (file_op_context_t *ctx, const char *src_path, const char *dst_pa force_update); if (ctx->dialog_type == FILEGUI_DIALOG_MULTI_ITEM) { - file_progress_show_count (ctx, ctx->total_progress_count, ctx->total_count); + file_progress_show_count (ctx); file_progress_show_total (ctx, ctx->total_progress_bytes, force_update); } @@ -3277,7 +3277,7 @@ FileProgressStatus erase_dir (file_op_context_t *ctx, const vfs_path_t *vpath) { file_progress_show_deleting (ctx, vpath, NULL); - file_progress_show_count (ctx, ctx->total_progress_count, ctx->total_count); + file_progress_show_count (ctx); if (file_progress_check_buttons (ctx) == FILE_ABORT) return FILE_ABORT; @@ -3626,7 +3626,7 @@ panel_operate (void *source_panel, FileOperation operation, gboolean force_singl { if (ctx->dialog_type == FILEGUI_DIALOG_MULTI_ITEM) { - file_progress_show_count (ctx, ctx->total_progress_count, ctx->total_count); + file_progress_show_count (ctx); file_progress_show_total (ctx, ctx->progress_bytes, FALSE); } diff --git a/src/filemanager/filegui.c b/src/filemanager/filegui.c index 5f280f71a..1341f5925 100644 --- a/src/filemanager/filegui.c +++ b/src/filemanager/filegui.c @@ -1077,7 +1077,7 @@ file_progress_show (file_op_context_t *ctx, off_t done, off_t total, /* --------------------------------------------------------------------------------------------- */ void -file_progress_show_count (file_op_context_t *ctx, size_t done, size_t total) +file_progress_show_count (file_op_context_t *ctx) { file_progress_ui_t *ui; @@ -1090,10 +1090,11 @@ file_progress_show_count (file_op_context_t *ctx, size_t done, size_t total) return; if (ctx->totals_computed) - label_set_textv (ui->total_files_processed_label, _("Files processed: %zu / %zu"), done, - total); + label_set_textv (ui->total_files_processed_label, _("Files processed: %zu / %zu"), + ctx->total_progress_count, ctx->total_count); else - label_set_textv (ui->total_files_processed_label, _("Files processed: %zu"), done); + label_set_textv (ui->total_files_processed_label, _("Files processed: %zu"), + ctx->total_progress_count); } /* --------------------------------------------------------------------------------------------- */ diff --git a/src/filemanager/filegui.h b/src/filemanager/filegui.h index 8c2c4b04e..0d34e578e 100644 --- a/src/filemanager/filegui.h +++ b/src/filemanager/filegui.h @@ -173,7 +173,7 @@ FileProgressStatus file_progress_check_buttons (file_op_context_t * ctx); void file_progress_show (file_op_context_t * ctx, off_t done, off_t total, const char *stalled_msg, gboolean force_update); -void file_progress_show_count (file_op_context_t * ctx, size_t done, size_t total); +void file_progress_show_count (file_op_context_t * ctx); void file_progress_show_total (file_op_context_t * ctx, uintmax_t copied_bytes, gboolean show_summary); void file_progress_show_source (file_op_context_t * ctx, const vfs_path_t * vpath);