1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
diff -ruNd advancecomp-1.10.orig/compress.cc advancecomp-1.10/compress.cc
--- advancecomp-1.10.orig/compress.cc 2004-04-02 16:43:52.000000000 +0100
+++ advancecomp-1.10/compress.cc 2004-05-24 17:56:18.940619088 +0100
@@ -179,14 +179,14 @@
}
#if USE_BZIP2
-bool compress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int blocksize, int workfactor) {
- return BZ2_bzBuffToBuffCompress(out_data,&out_size,const_cast<unsigned char*>(in_data),in_size,blocksize,0,workfactor) == BZ_OK;
+bool compress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned& out_size, int blocksize, int workfactor) {
+ return BZ2_bzBuffToBuffCompress(out_data,&out_size,const_cast<char*>(in_data),in_size,blocksize,0,workfactor) == BZ_OK;
}
-bool decompress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size) {
+bool decompress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned out_size) {
unsigned size = out_size;
- if (BZ2_bzBuffToBuffDecompress(out_data,&size,const_cast<unsigned char*>(in_data),in_size,0,0)!=BZ_OK)
+ if (BZ2_bzBuffToBuffDecompress(out_data,&size,const_cast< char*>(in_data),in_size,0,0)!=BZ_OK)
return false;
if (size != out_size)
diff -ruNd advancecomp-1.10.orig/compress.h advancecomp-1.10/compress.h
--- advancecomp-1.10.orig/compress.h 2003-11-02 20:09:41.000000000 +0000
+++ advancecomp-1.10/compress.h 2004-05-24 17:56:18.941618936 +0100
@@ -40,8 +40,8 @@
bool decompress_deflate_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
bool compress_deflate_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int compression_level, int strategy, int mem_level);
-bool decompress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
-bool compress_bzip2(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int blocksize, int workfactor);
+bool decompress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned out_size);
+bool compress_bzip2(const char* in_data, unsigned in_size, char* out_data, unsigned& out_size, int blocksize, int workfactor);
bool decompress_rfc1950_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned out_size);
bool compress_rfc1950_zlib(const unsigned char* in_data, unsigned in_size, unsigned char* out_data, unsigned& out_size, int compression_level, int strategy, int mem_level);
diff -ruNd advancecomp-1.10.orig/stamp-h1 advancecomp-1.10/stamp-h1
--- advancecomp-1.10.orig/stamp-h1 1970-01-01 01:00:00.000000000 +0100
+++ advancecomp-1.10/stamp-h1 2004-05-24 17:56:18.942618784 +0100
@@ -0,0 +1 @@
+timestamp for config.h
diff -ruNd advancecomp-1.10.orig/zipsh.cc advancecomp-1.10/zipsh.cc
--- advancecomp-1.10.orig/zipsh.cc 2004-04-02 17:13:02.000000000 +0100
+++ advancecomp-1.10/zipsh.cc 2004-05-24 17:56:18.943618632 +0100
@@ -39,7 +39,7 @@
}
#ifdef USE_BZIP2
} else if (info.compression_method == ZIP_METHOD_BZIP2) {
- if (!decompress_bzip2(data,compressed_size_get(),uncompressed_data,uncompressed_size_get())) {
+ if (!decompress_bzip2((char *)data,compressed_size_get(),(char *)uncompressed_data,uncompressed_size_get())) {
data_free(uncompressed_data);
throw error() << "Invalid compressed data on file " << name_get();
}
@@ -247,7 +247,7 @@
c1_met = ZIP_METHOD_BZIP2;
c1_fla = 0;
- if (!compress_bzip2(uncompressed_data,uncompressed_size_get(),c1_data,c1_size,bzip2_level,bzip2_workfactor)) {
+ if (!compress_bzip2((char *)uncompressed_data,uncompressed_size_get(),(char *)c1_data,c1_size,bzip2_level,bzip2_workfactor)) {
data_free(c1_data);
c1_data = 0;
}
|
GitWeb
