From 6052b263e5e0cf27d1c509917d7b6eab17058454 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Wed, 16 Jan 2008 20:10:50 +0000
Subject: [PATCH] Adaption to Xorriso_standalonE, some consequences from
 compiler warnings

---
 libisoburn/trunk/test/ng_xorrisoburn.c    | 16 ++++++++++++++--
 libisoburn/trunk/test/xorriso.c           | 18 +++++++++---------
 libisoburn/trunk/test/xorriso_timestamp.h |  2 +-
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/libisoburn/trunk/test/ng_xorrisoburn.c b/libisoburn/trunk/test/ng_xorrisoburn.c
index 250d4323..12578c85 100644
--- a/libisoburn/trunk/test/ng_xorrisoburn.c
+++ b/libisoburn/trunk/test/ng_xorrisoburn.c
@@ -22,6 +22,7 @@
 
 /* ------------------------------------------------------------------------ */
 
+#ifndef Xorriso_standalonE
 
 /* The library which does the ISO 9660 / RockRidge manipulations */
 /* >>> NG  this is a botch name until somebody shows a better solution */
@@ -45,6 +46,17 @@
 /* >>> NG */
 #include "ng_xorrisoburn.h"
 
+#else /* ! Xorriso_standalonE */
+
+#include "../libisofs/libisofs.h"
+#include "../libburn/libburn.h"
+#include "../libisoburn/libisoburn.h"
+#include "xorriso.h"
+#include "xorriso_private.h"
+#include "xorrisoburn.h"
+
+#endif /* Xorriso_standalonE */
+
 
 int Xorriso_pacifier_loop(struct XorrisO *xorriso, struct burn_drive *drive,
                           int flag);
@@ -1296,7 +1308,7 @@ int Xorriso_process_msg_queues(struct XorrisO *xorriso, int flag)
 {
  int ret, error_code= 0, os_errno= 0, count= 0, pass, start_pass= 0;
  char severity[80];
- IsoImage *volume;
+ IsoImage *volume= NULL;
 
  if(xorriso->in_volset_handle==NULL)
    start_pass= 1;
@@ -3002,7 +3014,7 @@ int Xorriso_findi_action(struct XorrisO *xorriso, struct FindjoB *job,
                          char *abs_path, char *show_path, 
                          IsoNode *node, int depth, int flag)
 {
- int ret, type, action= 0;
+ int ret= 0, type, action= 0;
  uid_t user= 0;
  gid_t group= 0;
  time_t date= 0;
diff --git a/libisoburn/trunk/test/xorriso.c b/libisoburn/trunk/test/xorriso.c
index 98186973..ca6edce9 100644
--- a/libisoburn/trunk/test/xorriso.c
+++ b/libisoburn/trunk/test/xorriso.c
@@ -587,24 +587,24 @@ int Sfile_scale(double value, char *result, int siz, double thresh, int flag)
  } 
  if(scale_c!='b' && !(flag&4)) { /* is there room for fractional part ? */
    avail_siz= siz-1;
-   sprintf(form,"%%.lf");
-   sprintf(result,"%.lf",value);
+   sprintf(form,"%%.f");
+   sprintf(result,"%.f",value);
    if(strlen(result)<=avail_siz-2) 
      dec_siz= 1;                                  /* we are very modest */
  }
  if(scale_c=='b' && (flag&1)) {
    if(flag&2)
-     sprintf(form,"%%.lf");
+     sprintf(form,"%%.f");
    else
-     sprintf(form,"%%%d.lf",siz);
+     sprintf(form,"%%%d.f",siz);
    sprintf(result,form,value);
  } else {
    if(flag&2)
-     sprintf(form,"%%.lf%%c");
+     sprintf(form,"%%.f%%c");
    else if(dec_siz>0) 
-     sprintf(form,"%%%d.%dlf%%c",avail_siz,dec_siz);
+     sprintf(form,"%%%d.%df%%c",avail_siz,dec_siz);
    else
-     sprintf(form,"%%%d.lf%%c",siz-1);
+     sprintf(form,"%%%d.f%%c",siz-1);
    sprintf(result,form,value,scale_c);
  }
  return(1);
@@ -6240,7 +6240,7 @@ int Xorriso_option_cdi(struct XorrisO *xorriso, char *iso_rr_path, int flag)
 /* Option -cdx */
 int Xorriso_option_cdx(struct XorrisO *xorriso, char *disk_path, int flag)
 {
- char sfe[5*SfileadrL], path[SfileadrL], eff_path[SfileadrL];;
+ char sfe[5*SfileadrL], path[SfileadrL], eff_path[SfileadrL];
  int ret;
 
  if (strlen(disk_path)>sizeof(xorriso->wdx)) {
@@ -8714,7 +8714,7 @@ int Xorriso_execute_option(struct XorrisO *xorriso, char *line, int flag)
    tdiff= 0.001;
  if(xorriso->error_count>0) {
    sprintf(xorriso->info_text,
-           "----------------------------- %7.lf errors encountered\n",
+           "----------------------------- %7.f errors encountered\n",
            xorriso->error_count);
    Xorriso_info(xorriso,!(flag&(1<<16)));
  }
diff --git a/libisoburn/trunk/test/xorriso_timestamp.h b/libisoburn/trunk/test/xorriso_timestamp.h
index 32de6565..a57ba595 100644
--- a/libisoburn/trunk/test/xorriso_timestamp.h
+++ b/libisoburn/trunk/test/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2008.01.16.141631"
+#define Xorriso_timestamP "2008.01.16.200942"