From 4d29a69dc316787b171d616ea5581b2093add936 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Mon, 4 Jul 2011 12:14:22 +0000
Subject: [PATCH] Reacted on warnings of -Wunused-but-set-variable

---
 libisoburn/trunk/xorriso/read_run.c          | 13 ++++++-------
 libisoburn/trunk/xorriso/xorriso_timestamp.h |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/libisoburn/trunk/xorriso/read_run.c b/libisoburn/trunk/xorriso/read_run.c
index 4e9011ac..6f71e584 100644
--- a/libisoburn/trunk/xorriso/read_run.c
+++ b/libisoburn/trunk/xorriso/read_run.c
@@ -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;
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index e9e8dc8c..1730f511 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2011.07.04.105854"
+#define Xorriso_timestamP "2011.07.04.121342"