From 05f1080036dc0296a87a74e301386a7240bde532 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Mon, 26 Nov 2007 19:22:38 +0000 Subject: [PATCH] Reacted on warnings on a 64 bit system --- test/xorriso.c | 8 +++++--- test/xorriso_timestamp.h | 2 +- test/xorrisoburn.c | 10 +++++----- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/test/xorriso.c b/test/xorriso.c index e0f403b7..781d0b76 100644 --- a/test/xorriso.c +++ b/test/xorriso.c @@ -6,6 +6,7 @@ or cc -g -DXorriso_with_maiN -DXorriso_with_regeX -DXorriso_with_readlinE \ + -DXorriso_build_timestamP='"'"$(date -u '+%Y.%m.%d.%H%M%S')"'"' \ -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ -o test/xorriso \ test/xorriso.c test/xorrisoburn.c \ @@ -14,6 +15,7 @@ or or cc -g -DXorriso_with_regeX -DXorriso_with_readlinE \ + -DXorriso_build_timestamP='"'"$(date -u '+%Y.%m.%d.%H%M%S')"'"' \ -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ -c \ test/xorriso.c test/xorrisoburn.c @@ -4011,7 +4013,7 @@ int Xorriso_option_cdi(struct XorrisO *xorriso, char *iso_rr_path, int flag) if (strlen(iso_rr_path)>sizeof(xorriso->wdi)) { sprintf(xorriso->info_text,"-cdi: iso_rr_path too long (%d > %d)", - strlen(iso_rr_path), sizeof(xorriso->wdi)-1); + (int) strlen(iso_rr_path), (int) sizeof(xorriso->wdi)-1); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); return(0); } @@ -4064,7 +4066,7 @@ int Xorriso_option_cdx(struct XorrisO *xorriso, char *disk_path, int flag) if (strlen(disk_path)>sizeof(xorriso->wdx)) { sprintf(xorriso->info_text,"-cdx: disk_path too long (%d > %d)", - strlen(disk_path), sizeof(xorriso->wdx)-1); + (int) strlen(disk_path), (int) sizeof(xorriso->wdx)-1); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); return(0); } @@ -5394,7 +5396,7 @@ int Xorriso_option_prog(struct XorrisO *xorriso, char *name, int flag) if(strlen(name)>=sizeof(xorriso->progname)) { sprintf(xorriso->info_text, "Name too long with option -prog (%d > %d)", - strlen(name), sizeof(xorriso->progname)-1); + (int) strlen(name), (int) sizeof(xorriso->progname)-1); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); return(0); } diff --git a/test/xorriso_timestamp.h b/test/xorriso_timestamp.h index 118eefc6..8fa386e4 100644 --- a/test/xorriso_timestamp.h +++ b/test/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2007.11.14.175446" +#define Xorriso_timestamP "2007.11.26.192113" diff --git a/test/xorrisoburn.c b/test/xorrisoburn.c index 6b133e09..212823a0 100644 --- a/test/xorrisoburn.c +++ b/test/xorrisoburn.c @@ -687,7 +687,7 @@ bonked_root:; if(ret<=0) { much_too_long:; sprintf(xorriso->info_text, "Effective path gets much too long (%d)", - strlen(eff_path)+strlen(apt)+1); + (int) (strlen(eff_path)+strlen(apt)+1)); if(!(flag&1)) Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); return(-1); @@ -1948,7 +1948,7 @@ int Xorriso_ls_filev(struct XorrisO *xorriso, int filec, char **filev, much_too_long:; sprintf(xorriso->info_text, "Path for file listing gets much too long (%d)", - strlen(path)+strlen(filev[i])+1); + (int) (strlen(path)+strlen(filev[i])+1)); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); was_error++; continue; @@ -2350,7 +2350,7 @@ int Xorriso_obtain_pattern_files( if(xorriso->re_fill==0) { /* This is the empty pattern representing root */ if(flag&1) { - *filec++; + (*filec)++; (*mem)+= 8; return(1); } else { @@ -2380,7 +2380,7 @@ int Xorriso_obtain_pattern_files( much_too_long:; sprintf(xorriso->info_text, "Path for pattern matching gets much too long (%d)", - strlen(adr)+strlen(name)+1); + (int) (strlen(adr)+strlen(name)+1)); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); return(0); } @@ -2421,7 +2421,7 @@ unexpected_change:; out_of_memory:; sprintf(xorriso->info_text, "Cannot allocate enough memory (%d bytes) for pattern expansion", - strlen(adr)+1); + (int) strlen(adr)+1); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FATAL", 0); return(-1); }