File ciso-warnings.patch of Package ciso
Index: Makefile
===================================================================
--- Makefile.orig
+++ Makefile
@@ -8,13 +8,13 @@ INSTALL = install
all : ciso
ciso : ciso.o
- gcc -o ciso ciso.o -lz
+ gcc -o ciso $(CFLAGS) ciso.o -lz
ciso.o : ciso.c
- gcc -o ciso.o -c ciso.c
+ gcc -o ciso.o $(CFLAGS) -c ciso.c
install :
- $(INSTALL) -m 755 ciso $(USRBINDIR)/ciso
+ $(INSTALL) -D -m 755 ciso $(USRBINDIR)/ciso
clean:
rm -rf *.o
Index: ciso.c
===================================================================
--- ciso.c.orig
+++ ciso.c
@@ -24,6 +24,7 @@
#include <stdlib.h>
#include <zlib.h> /* /usr(/local)/include/zlib.h */
#include <zconf.h>
+#include <string.h>
#include "ciso.h"
@@ -80,13 +81,10 @@ unsigned long long check_file_size(FILE
****************************************************************************/
int decomp_ciso(void)
{
- unsigned long long file_size;
unsigned int index , index2;
unsigned long long read_pos , read_size;
- int total_sectors;
int index_size;
int block;
- unsigned char buf4[4];
int cmp_size;
int status;
int percent_period;
@@ -138,8 +136,8 @@ 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("block size %d bytes\n",ciso.block_size);
+ printf("Total File Size %lu bytes\n",ciso.total_bytes);
+ printf("block size %u bytes\n",ciso.block_size);
printf("total blocks %d blocks\n",ciso_total_block);
printf("index align %d\n",1<<ciso.align);
@@ -209,7 +207,7 @@ int decomp_ciso(void)
cmp_size = ciso.block_size - z.avail_out;
if(cmp_size != ciso.block_size)
{
- printf("block %d : block size error %d != %d\n",block,cmp_size , ciso.block_size);
+ printf("block %d : block size error %d != %u\n",block,cmp_size , ciso.block_size);
return 1;
}
}
@@ -239,7 +237,6 @@ int comp_ciso(int level)
{
unsigned long long file_size;
unsigned long long write_pos;
- int total_sectors;
int index_size;
int block;
unsigned char buf4[64];
@@ -279,8 +276,8 @@ 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("block size %d bytes\n",ciso.block_size);
+ printf("Total File Size %lu bytes\n",ciso.total_bytes);
+ printf("block size %u bytes\n",ciso.block_size);
printf("index align %d\n",1<<ciso.align);
printf("compress level %d\n",level);
@@ -304,7 +301,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 %3llu%%\r"
,block / percent_period
,block==0 ? 0 : 100*write_pos/(block*0x800));
}