mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 12:56:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

(panel_compute_totals): fix display of directory scanning statistics.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2013-12-11 16:16:22 +04:00
parent 249c3e2470
commit 675de9a7db
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/filemanager/file.c
View File

@ -1235,8 +1235,7 @@ panel_compute_totals (const WPanel * panel, void *ui, compute_dir_size_callback
size_t * ret_count, uintmax_t * ret_total, gboolean compute_symlinks) size_t * ret_count, uintmax_t * ret_total, gboolean compute_symlinks)
{ {
int i; int i;
size_t lc_count = 0; size_t dir_count = 0;
uintmax_t lc_total = 0;
for (i = 0; i < panel->dir.len; i++) for (i = 0; i < panel->dir.len; i++)
{ {
@ -1251,31 +1250,22 @@ panel_compute_totals (const WPanel * panel, void *ui, compute_dir_size_callback
{ {
vfs_path_t *p; vfs_path_t *p;
FileProgressStatus status; FileProgressStatus status;
size_t lc_dir_count = 0;
size_t lc_marked = 0;
uintmax_t lc_total2 = 0;
p = vfs_path_append_new (panel->cwd_vpath, panel->dir.list[i].fname, NULL); p = vfs_path_append_new (panel->cwd_vpath, panel->dir.list[i].fname, NULL);
status = compute_dir_size (p, ui, cback, &lc_dir_count, &lc_marked, &lc_total2, status = compute_dir_size (p, ui, cback, &dir_count, ret_count, ret_total,
compute_symlinks); compute_symlinks);
vfs_path_free (p); vfs_path_free (p);
if (status != FILE_CONT) if (status != FILE_CONT)
return status; return status;
lc_count += lc_marked;
lc_total += lc_total2;
} }
else else
{ {
lc_count++; (*ret_count)++;
lc_total += (uintmax_t) s->st_size; *ret_total += (uintmax_t) s->st_size;
} }
} }
*ret_count = lc_count;
*ret_total = lc_total;
return FILE_CONT; return FILE_CONT;
} }