53 lines
2.2 KiB
Text
53 lines
2.2 KiB
Text
Fix namespace collision with libz
|
|
|
|
Index: src/dump.c
|
|
--- src/dump.c.orig
|
|
+++ src/dump.c
|
|
@@ -249,9 +249,9 @@ void DB_decompress(SWISH * sw, IndexFILE * indexf,
|
|
/* parse and print word's data */
|
|
s = worddata;
|
|
|
|
- tmpval = uncompress2(&s); /* tfrequency */
|
|
- metaID = uncompress2(&s); /* metaID */
|
|
- metadata_length = uncompress2(&s);
|
|
+ tmpval = swish_uncompress2(&s); /* tfrequency */
|
|
+ metaID = swish_uncompress2(&s); /* metaID */
|
|
+ metadata_length = swish_uncompress2(&s);
|
|
|
|
filenum = 0;
|
|
start = s;
|
|
@@ -276,8 +276,8 @@ void DB_decompress(SWISH * sw, IndexFILE * indexf,
|
|
if ( metadata_length == (s - start))
|
|
{
|
|
filenum = 0;
|
|
- metaID = uncompress2(&s);
|
|
- metadata_length = uncompress2(&s);
|
|
+ metaID = swish_uncompress2(&s);
|
|
+ metadata_length = swish_uncompress2(&s);
|
|
start = s;
|
|
}
|
|
|
|
@@ -337,9 +337,9 @@ void DB_decompress(SWISH * sw, IndexFILE * indexf,
|
|
/* parse and print word's data */
|
|
s = worddata;
|
|
|
|
- tmpval = uncompress2(&s); /* tfrequency */
|
|
- metaID = uncompress2(&s); /* metaID */
|
|
- metadata_length = uncompress2(&s);
|
|
+ tmpval = swish_uncompress2(&s); /* tfrequency */
|
|
+ metaID = swish_uncompress2(&s); /* metaID */
|
|
+ metadata_length = swish_uncompress2(&s);
|
|
|
|
filenum = 0;
|
|
start = s;
|
|
@@ -437,8 +437,8 @@ void DB_decompress(SWISH * sw, IndexFILE * indexf,
|
|
if ( metadata_length == (s - start))
|
|
{
|
|
filenum = 0;
|
|
- metaID = uncompress2(&s);
|
|
- metadata_length = uncompress2(&s);
|
|
+ metaID = swish_uncompress2(&s);
|
|
+ metadata_length = swish_uncompress2(&s);
|
|
start = s;
|
|
}
|
|
}
|