You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2011/03/27 03:29:27 UTC
[lucy-commits] svn commit: r1085850 - in /incubator/lucy/trunk:
charmonizer/src/Charmonizer/Core/ core/Lucy/Analysis/ core/Lucy/Store/
perl/xs/ perl/xs/Lucy/Document/ perl/xs/Lucy/Index/ perl/xs/Lucy/Object/
Author: marvin
Date: Sun Mar 27 01:29:27 2011
New Revision: 1085850
URL: http://svn.apache.org/viewvc?rev=1085850&view=rev
Log:
Address a number of GCC compiler warnings with casts and minor refactorings.
Modified:
incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.c
incubator/lucy/trunk/core/Lucy/Analysis/Inversion.c
incubator/lucy/trunk/core/Lucy/Store/FSFileHandle.c
incubator/lucy/trunk/core/Lucy/Store/InStream.c
incubator/lucy/trunk/perl/xs/Lucy/Document/Doc.c
incubator/lucy/trunk/perl/xs/Lucy/Index/DocReader.c
incubator/lucy/trunk/perl/xs/Lucy/Object/Err.c
incubator/lucy/trunk/perl/xs/XSBind.c
Modified: incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.c?rev=1085850&r1=1085849&r2=1085850&view=diff
==============================================================================
--- incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.c (original)
+++ incubator/lucy/trunk/charmonizer/src/Charmonizer/Core/ConfWriter.c Sun Mar 27 01:29:27 2011
@@ -22,6 +22,7 @@
#include "Charmonizer/Core/Compiler.h"
#include <errno.h>
#include <stdarg.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -45,7 +46,8 @@ ConfWriter_open_charmony_h(const char *c
/* Print supplied text (if any) along with warning, open include guard. */
if (charmony_start != NULL) {
- fprintf(charmony_fh, charmony_start);
+ fwrite(charmony_start, sizeof(char), strlen(charmony_start),
+ charmony_fh);
}
fprintf(charmony_fh,
"/* Header file auto-generated by Charmonizer. \n"
Modified: incubator/lucy/trunk/core/Lucy/Analysis/Inversion.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Analysis/Inversion.c?rev=1085850&r1=1085849&r2=1085850&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Analysis/Inversion.c (original)
+++ incubator/lucy/trunk/core/Lucy/Analysis/Inversion.c Sun Mar 27 01:29:27 2011
@@ -89,9 +89,9 @@ static void
S_grow(Inversion *self, size_t size)
{
if (size > self->cap) {
- int64_t amount = size * sizeof(Token*);
+ uint64_t amount = size * sizeof(Token*);
// Clip rather than wrap.
- if (amount > SIZE_MAX) { amount = SIZE_MAX; }
+ if (amount > SIZE_MAX || amount < size) { amount = SIZE_MAX; }
self->tokens = (Token**)REALLOCATE(self->tokens, (size_t)amount);
self->cap = size;
memset(self->tokens + self->size, 0,
Modified: incubator/lucy/trunk/core/Lucy/Store/FSFileHandle.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/FSFileHandle.c?rev=1085850&r1=1085849&r2=1085850&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/FSFileHandle.c (original)
+++ incubator/lucy/trunk/core/Lucy/Store/FSFileHandle.c Sun Mar 27 01:29:27 2011
@@ -196,7 +196,7 @@ FSFH_write(FSFileHandle *self, const voi
// Write data, track file length, check for errors.
int64_t check_val = write(self->fd, data, len);
self->len += check_val;
- if (check_val != len) {
+ if ((size_t)check_val != len) {
if (check_val == -1) {
Err_set_error(Err_new(CB_newf(
"Error when writing %u64 bytes: %s",
Modified: incubator/lucy/trunk/core/Lucy/Store/InStream.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Store/InStream.c?rev=1085850&r1=1085849&r2=1085850&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Store/InStream.c (original)
+++ incubator/lucy/trunk/core/Lucy/Store/InStream.c Sun Mar 27 01:29:27 2011
@@ -346,7 +346,7 @@ SI_read_bytes(InStream *self, char* buf,
if (len < IO_STREAM_BUF_SIZE) {
// Ensure that we have enough mapped, then copy the rest.
int64_t got = S_refill(self);
- if (got < len) {
+ if (got < (int64_t)len) {
int64_t orig_pos = SI_tell(self) - available;
int64_t orig_len = len + available;
THROW(ERR, "Read past EOF of %o (pos: %i64 len: %i64 "
Modified: incubator/lucy/trunk/perl/xs/Lucy/Document/Doc.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/xs/Lucy/Document/Doc.c?rev=1085850&r1=1085849&r2=1085850&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/xs/Lucy/Document/Doc.c (original)
+++ incubator/lucy/trunk/perl/xs/Lucy/Document/Doc.c Sun Mar 27 01:29:27 2011
@@ -63,7 +63,7 @@ lucy_Doc_store(lucy_Doc *self, const luc
? XSBind_cb_to_sv((lucy_CharBuf*)value)
: (SV*)Lucy_Obj_To_Host(value);
SvUTF8_on(key_sv);
- hv_store_ent((HV*)self->fields, key_sv, val_sv, 0);
+ (void)hv_store_ent((HV*)self->fields, key_sv, val_sv, 0);
// TODO: make this a thread-local instead of creating it every time?
SvREFCNT_dec(key_sv);
}
Modified: incubator/lucy/trunk/perl/xs/Lucy/Index/DocReader.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/xs/Lucy/Index/DocReader.c?rev=1085850&r1=1085849&r2=1085850&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/xs/Lucy/Index/DocReader.c (original)
+++ incubator/lucy/trunk/perl/xs/Lucy/Index/DocReader.c Sun Mar 27 01:29:27 2011
@@ -114,7 +114,7 @@ lucy_DefDocReader_fetch_doc(lucy_Default
}
// Store the value.
- hv_store_ent(fields, field_name_sv, value_sv, 0);
+ (void)hv_store_ent(fields, field_name_sv, value_sv, 0);
}
SvREFCNT_dec(field_name_sv);
Modified: incubator/lucy/trunk/perl/xs/Lucy/Object/Err.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/xs/Lucy/Object/Err.c?rev=1085850&r1=1085849&r2=1085850&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/xs/Lucy/Object/Err.c (original)
+++ incubator/lucy/trunk/perl/xs/Lucy/Object/Err.c Sun Mar 27 01:29:27 2011
@@ -76,7 +76,7 @@ lucy_Err_warn_mess(lucy_CharBuf *message
{
SV *error_sv = XSBind_cb_to_sv(message);
LUCY_DECREF(message);
- warn(SvPV_nolen(error_sv));
+ warn("%s", SvPV_nolen(error_sv));
SvREFCNT_dec(error_sv);
}
Modified: incubator/lucy/trunk/perl/xs/XSBind.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/xs/XSBind.c?rev=1085850&r1=1085849&r2=1085850&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/xs/XSBind.c (original)
+++ incubator/lucy/trunk/perl/xs/XSBind.c Sun Mar 27 01:29:27 2011
@@ -350,7 +350,7 @@ S_cfish_hash_to_perl_hash(cfish_Hash *ha
memcpy(key_sv_ptr, Cfish_CB_Get_Ptr8(key), key_size);
SvCUR_set(key_sv, key_size);
*SvEND(key_sv) = '\0';
- hv_store_ent(perl_hash, key_sv, val_sv, 0);
+ (void)hv_store_ent(perl_hash, key_sv, val_sv, 0);
}
}
SvREFCNT_dec(key_sv);
@@ -372,7 +372,7 @@ XSBind_enable_overload(void *pobj)
}
static chy_bool_t
-S_extract_from_sv(SV *value, void *target, const char *label, int label_len,
+S_extract_from_sv(SV *value, void *target, const char *label,
chy_bool_t required, int type, cfish_VTable *vtable,
void *allocation)
{
@@ -537,7 +537,7 @@ XSBind_allot_params(SV** stack, int32_t
if (memcmp(SvPVX(key_sv), label, label_len) == 0) {
SV *value = stack[tick + 1];
got_arg = S_extract_from_sv(value, target, label,
- label_len, required, type, vtable, allocation);
+ required, type, vtable, allocation);
if (!got_arg) {
CFISH_ERR_ADD_FRAME(cfish_Err_get_error());
return false;