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

Removed outdated macro case Xorriso_fat_local_meM

Browse Source
This commit is contained in:
Thomas Schmitt 2008-12-01 11:10:59 +00:00
parent 127a04454b
commit 01945a1279
3 changed files with 3 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libisoburn/trunk/xorriso/xorriso.c
View File

@ -6551,10 +6551,6 @@ int Xorriso_obtain_pattern_files_x(
struct stat stbuf;
dev_t dir_dev;
char *path;
#ifdef Xorriso_fat_local_meM
char adr[SfileadrL], name[SfileadrL], path_data[SfileadrL];
#else /* Xorriso_fat_local_meM */
char *adr= NULL, *name= NULL, *path_data= NULL;
adr= malloc(SfileadrL);
@ -6564,8 +6560,6 @@ int Xorriso_obtain_pattern_files_x(
Xorriso_no_malloc_memory(xorriso, &adr, 0);
{ret= -1; goto ex;}
}
#endif /* ! Xorriso_fat_local_meM */
follow_mount= (xorriso->do_follow_mount || xorriso->do_follow_pattern);
follow_links= (xorriso->do_follow_links || xorriso->do_follow_pattern);
if(!(flag&2))
@ -6649,16 +6643,12 @@ int Xorriso_obtain_pattern_files_x(
}
ret= 1;
ex:;
#ifndef Xorriso_fat_local_meM
if(adr!=NULL)
free(adr);
if(name!=NULL)
free(name);
if(path_data!=NULL)
free(path_data);
#endif /* ! Xorriso_fat_local_meM */
Dirseq_destroy(&dirseq,0);
if(flag&2)
(*dive_count)--;
@ -6897,7 +6887,7 @@ int Xorriso_warn_of_wildcards(struct XorrisO *xorriso, char *path, int flag)
} else {
sprintf(xorriso->info_text,
"Pattern expansion of wildcards \"*?[\" is disabled by command %s",
(flag&2) ? "-disk_pattern" : "-iso_rr_pattern");
(flag&2) ? "-disk_pattern or -pathspecs" : "-iso_rr_pattern");
}
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
sprintf(xorriso->info_text,"Pattern seen: %s\n", path);
@ -7565,10 +7555,6 @@ int Xorriso_show_dux_subs(struct XorrisO *xorriso,
struct stat stbuf;
dev_t dir_dev;
struct LinkiteM *own_link_stack;
#ifdef Xorriso_fat_local_meM
char path[SfileadrL], show_path[SfileadrL], name[SfileadrL], sfe[5*SfileadrL];
#else /* Xorriso_fat_local_meM */
char *path= NULL, *show_path= NULL, *name= NULL, *sfe= NULL;
sfe= malloc(5*SfileadrL);
@ -7579,9 +7565,6 @@ int Xorriso_show_dux_subs(struct XorrisO *xorriso,
Xorriso_no_malloc_memory(xorriso, &sfe, 0);
{ret= -1; goto ex;}
}
#endif /* ! Xorriso_fat_local_meM */
own_link_stack= link_stack;
namept= name;
*size= 0;
@ -7788,8 +7771,6 @@ revoke_sorting:;
ret= 1;
ex:;
#ifndef Xorriso_fat_local_meM
if(sfe!=NULL)
free(sfe);
if(path!=NULL)
@ -7798,8 +7779,6 @@ ex:;
free(show_path);
if(name!=NULL)
free(name);
#endif /* ! Xorriso_fat_local_meM */
Linkitem_reset_stack(&own_link_stack, link_stack, 0);
Dirseq_destroy(&dirseq, 0);
if(filev!=NULL) {
@ -8441,11 +8420,6 @@ int Xorriso_findx(struct XorrisO *xorriso, struct FindjoB *job,
struct stat stbuf;
struct LinkiteM *own_link_stack;
char *abs_dir_path, *namept;
#ifdef Xorriso_fat_local_meM
char name[SfileadrL], path[SfileadrL], sfe[5*SfileadrL];
char abs_dir_path_data[SfileadrL], abs_path[SfileadrL];
#else /* Xorriso_fat_local_meM */
char *name= NULL, *path= NULL, *sfe= NULL;
char *abs_dir_path_data= NULL, *abs_path= NULL;
@ -8459,8 +8433,6 @@ int Xorriso_findx(struct XorrisO *xorriso, struct FindjoB *job,
Xorriso_no_malloc_memory(xorriso, &sfe, 0);
{ret= -1; goto ex;}
}
#endif /* ! Xorriso_fat_local_meM */
own_link_stack= link_stack;
abs_dir_path= abs_dir_parm;
if(abs_dir_path[0]==0) {
@ -8577,8 +8549,6 @@ int Xorriso_findx(struct XorrisO *xorriso, struct FindjoB *job,
ret= 1;
ex:;
#ifndef Xorriso_fat_local_meM
if(sfe!=NULL)
free(sfe);
if(name!=NULL)
@ -8589,8 +8559,6 @@ ex:;
free(abs_dir_path_data);
if(abs_path!=NULL)
free(abs_path);
#endif /* ! Xorriso_fat_local_meM */
Dirseq_destroy(&dirseq, 0);
return(ret);
}

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2008.11.30.214121"
#define Xorriso_timestamP "2008.12.01.110022"

50
libisoburn/trunk/xorriso/xorrisoburn.c
View File

@ -1541,6 +1541,7 @@ int Xorriso_pacifier_loop(struct XorrisO *xorriso, struct burn_drive *drive,
}
progress.sector= 0;
current_time= Sfile_microtime(0);
measured_speed= 0.0;
while(1) {
last_time= current_time;
last_sector= progress.sector;
@ -2147,12 +2148,6 @@ int Xorriso_add_tree(struct XorrisO *xorriso, IsoDir *dir,
struct stat stbuf, hstbuf;
dev_t dir_dev;
struct LinkiteM *own_link_stack;
#ifdef Xorriso_fat_local_meM
char sfe[5*SfileadrL], sfe2[5*SfileadrL];
char disk_path[2*SfileadrL], img_path[2*SfileadrL], link_target[SfileadrL];
#else /* Xorriso_fat_local_meM */
char *sfe= NULL, *sfe2= NULL;
char *disk_path= NULL, *img_path= NULL, *link_target= NULL;
@ -2167,8 +2162,6 @@ int Xorriso_add_tree(struct XorrisO *xorriso, IsoDir *dir,
Xorriso_no_malloc_memory(xorriso, &sfe, 0);
{ret= -1; goto ex;}
}
#endif /* ! Xorriso_fat_local_meM */
own_link_stack= link_stack;
@ -2384,8 +2377,6 @@ was_problem:;
ret= 1;
ex:
#ifndef Xorriso_fat_local_meM
if(sfe!=NULL)
free(sfe);
if(sfe2!=NULL)
@ -2396,8 +2387,6 @@ ex:
free(img_path);
if(link_target!=NULL)
free(link_target);
#endif /* ! Xorriso_fat_local_meM */
Xorriso_process_msg_queues(xorriso,0);
Linkitem_reset_stack(&own_link_stack, link_stack, 0);
Dirseq_destroy(&dirseq, 0);
@ -4933,10 +4922,6 @@ int Xorriso_rmi(struct XorrisO *xorriso, void *boss_iter, off_t boss_mem,
IsoNode **node_array= NULL;
int node_count, node_idx;
#ifdef Xorriso_fat_local_meM
char sfe[5*SfileadrL], sub_path[2*SfileadrL];
#else
/* Avoiding large local memory objects in order to save stack space */
sfe= malloc(5*SfileadrL);
sub_path= malloc(2*SfileadrL);
@ -4944,7 +4929,6 @@ int Xorriso_rmi(struct XorrisO *xorriso, void *boss_iter, off_t boss_mem,
Xorriso_no_malloc_memory(xorriso, &sfe, 0);
{ret= -1; goto ex;}
}
#endif /* ! Xorriso_fat_local_meM */
#ifndef Libisofs_iso_dir_iter_sufficienT
/* Ticket 127: A80301 - A80302
@ -5146,14 +5130,10 @@ dir_not_removed:;
xorriso->volset_change_pending= 1;
ret= 1+!!is_dir;
ex:;
#ifndef Xorriso_fat_local_meM
if(sfe!=NULL)
free(sfe);
if(sub_path!=NULL)
free(sub_path);
#endif /* ! Xorriso_fat_local_meM */
Xorriso_findi_iter(xorriso, (IsoDir *) victim_node, &mem, &iter,
&node_array, &node_count, &node_idx, &node, (1<<31));
return(ret);
@ -5236,10 +5216,6 @@ int Xorriso_show_du_subs(struct XorrisO *xorriso, IsoDir *dir_node,
IsoNode *node, **node_array= NULL;
char *name;
off_t sub_size, report_size, mem= 0;
#ifdef Xorriso_fat_local_meM
char path[SfileadrL], show_path[SfileadrL], sfe[5*SfileadrL];
#else /* Xorriso_fat_local_meM */
char *path= NULL, *show_path= NULL, *sfe= NULL;
sfe= malloc(5*SfileadrL);
@ -5250,8 +5226,6 @@ int Xorriso_show_du_subs(struct XorrisO *xorriso, IsoDir *dir_node,
{ret= -1; goto ex;}
}
#endif /* ! Xorriso_fat_local_meM */
*size= 0;
ret= iso_dir_get_children(dir_node, &iter);
if(ret<0) {
@ -5359,16 +5333,12 @@ much_too_long:;
}
ret= 1;
ex:;
#ifndef Xorriso_fat_local_meM
if(sfe!=NULL)
free(sfe);
if(path!=NULL)
free(path);
if(show_path!=NULL)
free(show_path);
#endif /* ! Xorriso_fat_local_meM */
if(iter!=NULL)
iso_dir_iter_free(iter);
if(node_array!=NULL)
@ -5894,10 +5864,6 @@ int Xorriso_obtain_pattern_files_i(
IsoDirIter *iter= NULL;
IsoNode *node;
char *name;
#ifdef Xorriso_fat_local_meM
char adr[SfileadrL];
#else /* Xorriso_fat_local_meM */
char *adr= NULL;
adr= malloc(SfileadrL);
@ -5905,8 +5871,6 @@ int Xorriso_obtain_pattern_files_i(
Xorriso_no_malloc_memory(xorriso, &adr, 0);
{ret= -1; goto ex;}
}
#endif /* ! Xorriso_fat_local_meM */
if(!(flag&2))
*dive_count= 0;
@ -5953,12 +5917,8 @@ int Xorriso_obtain_pattern_files_i(
}
ret= 1;
ex:;
#ifndef Xorriso_fat_local_meM
if(adr!=NULL)
free(adr);
#endif /* ! Xorriso_fat_local_meM */
if(flag&2)
(*dive_count)--;
return(ret);
@ -6512,9 +6472,6 @@ int Xorriso_findi(struct XorrisO *xorriso, struct FindjoB *job,
off_t mem;
IsoNode **node_array= NULL;
int node_count, node_idx;
#ifdef Xorriso_fat_local_meM
char path[SfileadrL], abs_path[SfileadrL];
#else /* Xorriso_fat_local_meM */
char *path= NULL, *abs_path= NULL;
path= malloc(SfileadrL);
@ -6523,7 +6480,6 @@ int Xorriso_findi(struct XorrisO *xorriso, struct FindjoB *job,
Xorriso_no_malloc_memory(xorriso, &path, 0);
{ret= -1; goto ex;}
}
#endif /* ! Xorriso_fat_local_meM */
action= Findjob_get_action(job, 0);
if(action<0)
@ -6677,14 +6633,10 @@ int Xorriso_findi(struct XorrisO *xorriso, struct FindjoB *job,
ret= 1;
ex:;
#ifndef Xorriso_fat_local_meM
if(path!=NULL)
free(path);
if(abs_path!=NULL)
free(abs_path);
#endif /* ! Xorriso_fat_local_meM */
Xorriso_process_msg_queues(xorriso,0);
Xorriso_findi_iter(xorriso, dir_node, &mem, &iter, &node_array, &node_count,