You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2012/04/22 14:46:16 UTC
[lucy-commits] svn commit: r1328871 - in /lucy/trunk/core/Lucy: Analysis/Normalizer.c
Highlight/Highlighter.c Util/Json.c
Author: nwellnhof
Date: Sun Apr 22 12:46:15 2012
New Revision: 1328871
URL: http://svn.apache.org/viewvc?rev=1328871&view=rev
Log:
Fix some sign compare warnings
Modified:
lucy/trunk/core/Lucy/Analysis/Normalizer.c
lucy/trunk/core/Lucy/Highlight/Highlighter.c
lucy/trunk/core/Lucy/Util/Json.c
Modified: lucy/trunk/core/Lucy/Analysis/Normalizer.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Analysis/Normalizer.c?rev=1328871&r1=1328870&r2=1328871&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Analysis/Normalizer.c (original)
+++ lucy/trunk/core/Lucy/Analysis/Normalizer.c Sun Apr 22 12:46:15 2012
@@ -95,7 +95,7 @@ Normalizer_transform(Normalizer *self, I
len = utf8proc_reencode(buffer, len, self->options);
if (len >= 0) {
- if (len > token->len) {
+ if (len > (ssize_t)token->len) {
FREEMEM(token->text);
token->text = (char*)MALLOCATE(len + 1);
}
Modified: lucy/trunk/core/Lucy/Highlight/Highlighter.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Highlight/Highlighter.c?rev=1328871&r1=1328870&r2=1328871&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Highlight/Highlighter.c (original)
+++ lucy/trunk/core/Lucy/Highlight/Highlighter.c Sun Apr 22 12:46:15 2012
@@ -438,7 +438,7 @@ Highlighter_raw_excerpt(Highlighter *sel
// Remember original excerpt
CharBuf *orig_raw_excerpt = CB_Clone(raw_excerpt);
// Check for prepended ellipsis
- int32_t min_size = found_starting_edge ? 0 : 4;
+ uint32_t min_size = found_starting_edge ? 0 : 4;
do {
uint32_t code_point = CB_Code_Point_From(raw_excerpt, 1);
Modified: lucy/trunk/core/Lucy/Util/Json.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/Json.c?rev=1328871&r1=1328870&r2=1328871&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/Json.c (original)
+++ lucy/trunk/core/Lucy/Util/Json.c Sun Apr 22 12:46:15 2012
@@ -654,7 +654,7 @@ S_unescape_text(char *const top, char *c
static INLINE bool_t
SI_check_keyword(char *json, char* end, const char *keyword, size_t len) {
- if (end - json > len
+ if ((size_t)(end - json) > len
&& strncmp(json, keyword, len) == 0
&& json[len] != '_'
&& !isalnum(json[len])