libburnia/libisoburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed waste of time in Xorriso_show_du_subs()

Browse Source
This commit is contained in:
Thomas Schmitt 2007-12-16 14:47:26 +00:00
parent 0b54206e71
commit af44972353
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2007.12.16.122626" #define Xorriso_timestamP "2007.12.16.144615"

11
test/xorrisoburn.c
View File

@ -1861,6 +1861,8 @@ much_too_long:;
mem+= l; mem+= l;
if(l % sizeof(char *)) if(l % sizeof(char *))
mem+= sizeof(char *)-(l % sizeof(char *)); mem+= sizeof(char *)-(l % sizeof(char *));
if(flag&1) /* diving and counting is done further below */
continue;
ret= Xorriso_show_du_subs(xorriso, (struct iso_tree_node_dir *) node, ret= Xorriso_show_du_subs(xorriso, (struct iso_tree_node_dir *) node,
path, show_path, &sub_size, boss_mem, 0); path, show_path, &sub_size, boss_mem, 0);
if(ret<0) if(ret<0)
@ -1868,7 +1870,10 @@ much_too_long:;
if(ret==0) if(ret==0)
continue; continue;
} }
/*
sub_size+= iso_tree_node_get_size(node)+strlen(name)+1; sub_size+= iso_tree_node_get_size(node)+strlen(name)+1;
*/
sub_size+= iso_tree_node_get_size(node)+2048;
if(sub_size>0) if(sub_size>0)
(*size)+= sub_size; (*size)+= sub_size;
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
@ -1913,6 +1918,12 @@ much_too_long:;
path, show_path, &sub_size, boss_mem+mem, flag&1); path, show_path, &sub_size, boss_mem+mem, flag&1);
if(ret<0) if(ret<0)
goto ex; goto ex;
/*
sub_size+= iso_tree_node_get_size(node)+strlen(name)+1;
*/
sub_size+= iso_tree_node_get_size(node)+2048;
if(sub_size>0)
(*size)+= sub_size;
report_size= sub_size/1024; report_size= sub_size/1024;
if(report_size*1024<sub_size) if(report_size*1024<sub_size)
report_size++; report_size++;