Reacted on warnings of -Wunused-but-set-variable
This commit is contained in:
parent
6b9f2ad7ab
commit
4d29a69dc3
@ -923,7 +923,7 @@ int Xorriso_restore_disk_object(struct XorrisO *xorriso,
|
||||
{
|
||||
int ret, i, split_count= 0, partno, total_parts, leaf_is_split= 0;
|
||||
int record_hl_path= 0, node_idx, cannot_register= 0;
|
||||
off_t total_bytes, was_byte_count;
|
||||
off_t total_bytes;
|
||||
char *part_name, *part_path= NULL, *img_path_pt;
|
||||
IsoImage *volume;
|
||||
IsoNode *part_node, *first_part_node= NULL;
|
||||
@ -936,8 +936,6 @@ int Xorriso_restore_disk_object(struct XorrisO *xorriso,
|
||||
if(ret<=0)
|
||||
goto ex;
|
||||
|
||||
was_byte_count= xorriso->pacifier_byte_count;
|
||||
|
||||
if(LIBISO_ISDIR(node) && xorriso->do_concat_split)
|
||||
leaf_is_split= Xorriso_identify_split(xorriso, img_path, node,
|
||||
&split_parts, &split_count, &stbuf, 1|2);
|
||||
@ -1147,7 +1145,7 @@ int Xorriso_restore_tree(struct XorrisO *xorriso, IsoDir *dir,
|
||||
IsoDirIter *iter= NULL;
|
||||
IsoNode **node_array= NULL;
|
||||
int node_count, node_idx;
|
||||
int ret, source_is_dir, source_is_link, fret, was_failure= 0;
|
||||
int ret, source_is_dir, fret, was_failure= 0;
|
||||
int do_not_dive, source_is_split= 0, len_dp, len_ip, stbuf_ret, hflag, hret;
|
||||
char *name, *disk_name, *leaf_name, *srcpt, *stbuf_src= "";
|
||||
struct LinkiteM *own_link_stack;
|
||||
@ -1276,13 +1274,15 @@ much_too_long:;
|
||||
if(ret<=0)
|
||||
goto was_problem;
|
||||
source_is_dir= 0;
|
||||
source_is_link= S_ISLNK(stbuf.st_mode);
|
||||
|
||||
#ifdef Osirrox_not_yeT
|
||||
|
||||
/* ??? Link following in the image would cause severe problems
|
||||
with Xorriso_path_from_node() */
|
||||
|
||||
int source_is_link;
|
||||
|
||||
source_is_link= S_ISLNK(stbuf.st_mode);
|
||||
if(xorriso->do_follow_links && source_is_link) {
|
||||
/* Xorriso_hop_link checks for wide link loops */
|
||||
ret= Xorriso_hop_link(xorriso, srcpt, &own_link_stack, &hstbuf, 0);
|
||||
@ -1613,7 +1613,7 @@ ex:;
|
||||
|
||||
int Xorriso_restore_node_array(struct XorrisO *xorriso, int flag)
|
||||
{
|
||||
int i, ret, was_failure= 0, fret, hflag, stbuf_ret, faulty_family= 0;
|
||||
int i, ret, fret, hflag, stbuf_ret, faulty_family= 0;
|
||||
struct PermiteM *perm_stack_mem;
|
||||
char *img_path= NULL, *disk_path= NULL;
|
||||
IsoNode *node;
|
||||
@ -1704,7 +1704,6 @@ int Xorriso_restore_node_array(struct XorrisO *xorriso, int flag)
|
||||
continue; /* regular bottom of loop */
|
||||
was_problem:;
|
||||
faulty_family= 1;
|
||||
was_failure= 1;
|
||||
fret= Xorriso_eval_problem_status(xorriso, ret, 1|2);
|
||||
if(fret<0)
|
||||
goto ex;
|
||||
|
@ -1 +1 @@
|
||||
#define Xorriso_timestamP "2011.07.04.105854"
|
||||
#define Xorriso_timestamP "2011.07.04.121342"
|
||||
|
Loading…
Reference in New Issue
Block a user