Sophie

Sophie

distrib > Fedora > 13 > i386 > media > updates-src > by-pkgid > c825f2a290942d81d4dab9047f6033bb > files > 2

ciso-1.0.0-3.fc13.src.rpm

diff -up ciso-1.0.0/ciso.c.chdorb ciso-1.0.0/ciso.c
--- ciso-1.0.0/ciso.c.chdorb	2010-02-09 21:47:57.539407959 +0100
+++ ciso-1.0.0/ciso.c	2010-02-09 21:51:13.835786263 +0100
@@ -138,7 +138,7 @@ int decomp_ciso(void)
 
 	/* show info */
 	printf("Decompress '%s' to '%s'\n",fname_in,fname_out);
-	printf("Total File Size %ld bytes\n",ciso.total_bytes);
+	printf("Total File Size %lld bytes\n",ciso.total_bytes);
 	printf("block size      %d  bytes\n",ciso.block_size);
 	printf("total blocks    %d  blocks\n",ciso_total_block);
 	printf("index align     %d\n",1<<ciso.align);
@@ -279,7 +279,7 @@ int comp_ciso(int level)
 
 	/* show info */
 	printf("Compress '%s' to '%s'\n",fname_in,fname_out);
-	printf("Total File Size %ld bytes\n",ciso.total_bytes);
+	printf("Total File Size %lld bytes\n",ciso.total_bytes);
 	printf("block size      %d  bytes\n",ciso.block_size);
 	printf("index align     %d\n",1<<ciso.align);
 	printf("compress level  %d\n",level);
@@ -304,7 +304,7 @@ int comp_ciso(int level)
 		if(--percent_cnt<=0)
 		{
 			percent_cnt = percent_period;
-			printf("compress %3d%% avarage rate %3d%%\r"
+			printf("compress %3d%% avarage rate %3lld%%\r"
 				,block / percent_period
 				,block==0 ? 0 : 100*write_pos/(block*0x800));
 		}
diff -up ciso-1.0.0/ciso.h.chdorb ciso-1.0.0/ciso.h
--- ciso-1.0.0/ciso.h.chdorb	2010-02-09 21:46:13.516003275 +0100
+++ ciso-1.0.0/ciso.h	2010-02-09 21:46:13.520509442 +0100
@@ -25,12 +25,16 @@
 /*
 	complessed ISO(9660) header format
 */
+#include <stdint.h>
+#include <string.h>
+
+
 typedef struct ciso_header
 {
 	unsigned char magic[4];			/* +00 : 'C','I','S','O'                 */
-	unsigned long header_size;		/* +04 : header size (==0x18)            */
+	uint32_t header_size;	     	/* +04 : header size (==0x18)            */
 	unsigned long long total_bytes;	/* +08 : number of original data size    */
-	unsigned long block_size;		/* +10 : number of compressed block size */
+	uint32_t block_size;		    /* +10 : number of compressed block size */
 	unsigned char ver;				/* +14 : version 01                      */
 	unsigned char align;			/* +15 : align of index value            */
 	unsigned char rsv_06[2];		/* +16 : reserved                        */