Mailing List Archive

Author: creamyg
Date: 2008-07-30 05:34:54 -0700 (Wed, 30 Jul 2008)
New Revision: 3677

Modified:
trunk/c_src/KinoSearch/Index/DocWriter.c
trunk/c_src/KinoSearch/Index/Inverter.c
trunk/c_src/KinoSearch/Index/TermVectorsWriter.c
trunk/c_src/KinoSearch/Util/CharBuf.c
trunk/perl/lib/KinoSearch/Index/IndexFileNames.pm
trunk/perl/xs/KinoSearch/Index/SegWriter.c
Log:
Address miscellaneous harmless compiler warnings.


Modified: trunk/c_src/KinoSearch/Index/DocWriter.c
===================================================================
--- trunk/c_src/KinoSearch/Index/DocWriter.c 2008-07-30 06:37:28 UTC (rev 3676)
+++ trunk/c_src/KinoSearch/Index/DocWriter.c 2008-07-30 12:34:54 UTC (rev 3677)
@@ -53,7 +53,12 @@
u32_t num_stored = 0;
u64_t start = OutStream_Tell(ds_out);
bool_t have_compressed = false;
+ u32_t expected = OutStream_Tell(dsx_out) / 16;

+ /* Verify doc num. */
+ if (doc_num != expected)
+ CONFESS("Expected doc num %u32 but got %u32", expected, doc_num);
+
/* Write the number of stored fields. */
Inverter_Iter_Init(inverter);
while (Inverter_Next(inverter)) {

Modified: trunk/c_src/KinoSearch/Index/Inverter.c
===================================================================
--- trunk/c_src/KinoSearch/Index/Inverter.c 2008-07-30 06:37:28 UTC (rev 3676)
+++ trunk/c_src/KinoSearch/Index/Inverter.c 2008-07-30 12:34:54 UTC (rev 3677)
@@ -138,8 +138,8 @@
}
else if (fspec->indexed || fspec->vectorized) {
size_t token_len = ViewCB_Get_Size(value_vcb);
- Token *seed = Token_new(ViewCB_Get_Ptr8(value_vcb), token_len, 0,
- token_len, 1.0f, 1);
+ Token *seed = Token_new((char*)ViewCB_Get_Ptr8(value_vcb), token_len,
+ 0, token_len, 1.0f, 1);
self->inversions[self->num_fields] = TokenBatch_new(seed);
REFCOUNT_DEC(seed);
TokenBatch_Invert(self->inversions[self->num_fields]);

Modified: trunk/c_src/KinoSearch/Index/TermVectorsWriter.c
===================================================================
--- trunk/c_src/KinoSearch/Index/TermVectorsWriter.c 2008-07-30 06:37:28 UTC (rev 3676)
+++ trunk/c_src/KinoSearch/Index/TermVectorsWriter.c 2008-07-30 12:34:54 UTC (rev 3677)
@@ -53,7 +53,12 @@
OutStream *tvx_out = self->tvx_out;
i64_t filepos = OutStream_Tell(tv_out);
u32_t num_vectorized = 0;
+ u32_t expected = OutStream_Tell(tvx_out) / 16;

+ /* Verify doc num. */
+ if (doc_num != expected)
+ CONFESS("Expected doc num %u32 but got %u32", expected, doc_num);
+
/* Count, then write number of vectorized fields. */
Inverter_Iter_Init(inverter);
while (Inverter_Next(inverter)) {

Modified: trunk/c_src/KinoSearch/Util/CharBuf.c
===================================================================
--- trunk/c_src/KinoSearch/Util/CharBuf.c 2008-07-30 06:37:28 UTC (rev 3676)
+++ trunk/c_src/KinoSearch/Util/CharBuf.c 2008-07-30 12:34:54 UTC (rev 3677)
@@ -372,7 +372,7 @@
i32_t addend = isdigit(code_point)
? code_point - '0'
: tolower(code_point) - 'a';
- if (addend > base) break;
+ if (addend > (i32_t)base) break;
retval *= base;
retval += addend;
}

Modified: trunk/perl/lib/KinoSearch/Index/IndexFileNames.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Index/IndexFileNames.pm 2008-07-30 06:37:28 UTC (rev 3676)
+++ trunk/perl/lib/KinoSearch/Index/IndexFileNames.pm 2008-07-30 12:34:54 UTC (rev 3677)
@@ -22,7 +22,7 @@
CODE:
{
kino_VArray *unused = kino_IxFileNames_unused_files(files, snapshots);
- RETVAL = kobj_to_pobj(unused);
+ RETVAL = kobj_to_pobj((kino_Obj*)unused);
REFCOUNT_DEC(unused);
}
OUTPUT:RETVAL

Modified: trunk/perl/xs/KinoSearch/Index/SegWriter.c
===================================================================
--- trunk/perl/xs/KinoSearch/Index/SegWriter.c 2008-07-30 06:37:28 UTC (rev 3676)
+++ trunk/perl/xs/KinoSearch/Index/SegWriter.c 2008-07-30 12:34:54 UTC (rev 3677)
@@ -26,9 +26,13 @@
HE *entry = hv_iternext(fields);
kino_FieldSpec *fspec;
STRLEN key_len;
+ /* Copied from Perl 5.10.0 HePV macro, because the HePV macro in
+ * earlier versions of Perl triggers a compiler warning. */
+ char *key = HeKLEN(entry) == HEf_SVKEY
+ ? SvPV(HeKEY_sv(entry), key_len)
+ : ((key_len = HeKLEN(entry)), HeKEY(entry));
+ SV *value_sv = HeVAL(entry);
STRLEN value_len;
- char *key = HePV(entry, key_len);
- SV *value_sv = HeVAL(entry);
char *value;

/* Find the FieldSpec for this field. */


_______________________________________________
kinosearch-commits mailing list
kinosearch-commits@rectangular.com
http://www.rectangular.com/mailman/listinfo/kinosearch-commits