isomorfeus-ferret 0.12.4 → 0.12.7

data/ext/isomorfeus_ferret_ext/frt_q_phrase.c

@@ -86,8 +86,7 @@ static bool pp_next_position(PhPos *self)
     if (self->count >= 0) {         /* read subsequent pos's */
         self->position = tpe->next_position(tpe) - self->offset;
         return true;
-    }
-    else {
+    } else {
         return false;
     }
 }
@@ -104,11 +103,12 @@ static int pp_cmp(const void *const p1, const void *const p2)
 {
     int cmp = PP_pp(p1)->doc - PP_pp(p2)->doc;
     if (cmp == 0) {
-        return PP_pp(p1)->position - PP_pp(p2)->position;
-    }
-    else {
-        return cmp;
+        cmp = PP_pp(p1)->position - PP_pp(p2)->position;
+        if (cmp == 0) {
+            return PP_pp(p1)->offset - PP_pp(p2)->offset;
+        }
     }
+    return cmp;
 }
 
 static int pp_pos_cmp(const void *const p1, const void *const p2)
@@ -120,8 +120,7 @@ static bool pp_less_than(const PhPos *pp1, const PhPos *pp2)
 {
     if (pp1->position == pp2->position) {
         return pp1->offset < pp2->offset;
-    }
-    else {
+    } else {
         return pp1->position < pp2->position;
     }
 }
@@ -455,7 +454,7 @@ static float sphsc_phrase_freq(FrtScorer *self)
         res = pp_first_position(pp);
         assert(res);(void)res;
         if (check_repeats && (i > 0)) {
-            if (!sphsc_check_repeats(pp, phsc->phrase_pos, i)) {
+            if (!sphsc_check_repeats(pp, phsc->phrase_pos, i - 1)) {
                 goto return_freq;
             }
         }
@@ -464,9 +463,8 @@ static float sphsc_phrase_freq(FrtScorer *self)
         }
         frt_pq_push(pq, pp);
     }
-    int pqsize = pq->size;
+
     do {
-        pqsize--;
         pp = (PhPos *)frt_pq_pop(pq);
         pos = start = pp->position;
         next_pos = PP(frt_pq_top(pq))->position;
@@ -487,10 +485,9 @@ static float sphsc_phrase_freq(FrtScorer *self)
             last_pos = pp->position;
         }
         frt_pq_push(pq, pp);        /* restore pq */
-        if (pqsize == 0) { done = true; }
     } while (!done);
-return_freq:
 
+return_freq:
     frt_pq_destroy(pq);
     return freq;
 }
@@ -545,12 +542,12 @@ static FrtScorer *phw_scorer(FrtWeight *self, FrtIndexReader *ir)
         const int t_cnt = frt_ary_size(terms);
         if (t_cnt == 1) {
             tps[i] = ir->term_positions(ir);
+            assert(NULL != tps[i]); /* neither frt_mtdpe_new nor ir->term_positions should return NULL */
             tps[i]->seek(tps[i], field_num, terms[0]);
         } else {
             tps[i] = frt_mtdpe_new(ir, field_num, terms, t_cnt);
+            assert(NULL != tps[i]); /* neither frt_mtdpe_new nor ir->term_positions should return NULL */
         }
-        /* neither frt_mtdpe_new nor ir->term_positions should return NULL */
-        assert(NULL != tps[i]);
     }
 
     if (phq->slop == 0) {       /* optimize exact (common) case */

data/ext/isomorfeus_ferret_ext/frt_ram_store.c

@@ -179,6 +179,7 @@ static off_t ram_length(FrtStore *store, const char *filename)
 
 static void ramo_flush_i(FrtOutStream *os, const frt_uchar *src, int len)
 {
+    if (len == 0) { return; }
     frt_uchar *buffer;
     FrtRAMFile *rf = os->file.rf;
     int buffer_number, buffer_offset, bytes_in_buffer, bytes_to_copy;

data/ext/isomorfeus_ferret_ext/frt_scanner.c

@@ -896,4 +896,5 @@ _again:
 
         out[*token_size] = 0;
     }
+	(void)stack;
 }

data/ext/isomorfeus_ferret_ext/frt_scanner_mb.c

@@ -6702,4 +6702,5 @@ _again:
         wc_to_mb(out_mb, out_mb_size, token_size, out_wc, sizeof(out_wc));
         out_mb[*token_size] = 0;
     }
+	(void)stack;
 }

data/ext/isomorfeus_ferret_ext/frt_scanner_utf8.c

@@ -4416,4 +4416,5 @@ _again:
 
         out[*token_size] = 0;
     }
+	(void)stack;
 }

data/ext/isomorfeus_ferret_ext/frt_search.h

@@ -909,7 +909,7 @@ typedef struct FrtQueryParser
     bool use_keywords : 1;
     bool use_typed_range_query : 1;
 } FrtQueryParser;
-typedef FrtQueryParser FrtQParser; /* QParser is an alias for QueryParser */
+typedef FrtQueryParser FrtQParser; /* FrtQParser is an alias for FrtQueryParser */
 
 extern FrtQParser *frt_qp_new(FrtAnalyzer *analyzer);
 extern void frt_qp_add_field(FrtQParser *self, FrtSymbol field,

data/ext/isomorfeus_ferret_ext/libstemmer.c

@@ -22,10 +22,10 @@ sb_stemmer_list(void)
 static stemmer_encoding_t
 sb_getenc(const char * charenc)
 {
-    struct stemmer_encoding * encoding;
+    const struct stemmer_encoding * encoding;
     if (charenc == NULL) return ENC_UTF_8;
     for (encoding = encodings; encoding->name != 0; encoding++) {
-	if (strcmp(encoding->name, charenc) == 0) break;
+        if (strcmp(encoding->name, charenc) == 0) break;
     }
     if (encoding->name == NULL) return ENC_UNKNOWN;
     return encoding->enc;
@@ -35,18 +35,20 @@ extern struct sb_stemmer *
 sb_stemmer_new(const char * algorithm, const char * charenc)
 {
     stemmer_encoding_t enc;
-    struct stemmer_modules * module;
-    struct sb_stemmer * stemmer =
-	    (struct sb_stemmer *) malloc(sizeof(struct sb_stemmer));
-    if (stemmer == NULL) return NULL;
+    const struct stemmer_modules * module;
+    struct sb_stemmer * stemmer;
+
     enc = sb_getenc(charenc);
     if (enc == ENC_UNKNOWN) return NULL;
 
     for (module = modules; module->name != 0; module++) {
-	if (strcmp(module->name, algorithm) == 0 && module->enc == enc) break;
+        if (strcmp(module->name, algorithm) == 0 && module->enc == enc) break;
     }
     if (module->name == NULL) return NULL;
-    
+
+    stemmer = (struct sb_stemmer *) malloc(sizeof(struct sb_stemmer));
+    if (stemmer == NULL) return NULL;
+
     stemmer->create = module->create;
     stemmer->close = module->close;
     stemmer->stem = module->stem;
@@ -65,9 +67,10 @@ void
 sb_stemmer_delete(struct sb_stemmer * stemmer)
 {
     if (stemmer == 0) return;
-    if (stemmer->close == 0) return;
-    stemmer->close(stemmer->env);
-    stemmer->close = 0;
+    if (stemmer->close) {
+        stemmer->close(stemmer->env);
+        stemmer->close = 0;
+    }
     free(stemmer);
 }
 

data/ext/isomorfeus_ferret_ext/libstemmer.h

@@ -26,9 +26,9 @@ const char ** sb_stemmer_list(void);
  *
  *  @param charenc The character encoding.  NULL may be passed as
  *  this value, in which case UTF-8 encoding will be assumed. Otherwise,
- *  the argument may be one of "UTF_8", "ISO_8859_1" (ie, Latin 1),
- *  "CP850" (ie, MS-DOS Latin 1) or "KOI8_R" (Russian).  Note that
- *  case is significant in this parameter.
+ *  the argument may be one of "UTF_8", "ISO_8859_1" (i.e. Latin 1),
+ *  "ISO_8859_2" (i.e. Latin 2) or "KOI8_R" (Russian).  Note that case is
+ *  significant in this parameter.
  *
  *  @return NULL if the specified algorithm is not recognised, or the
  *  algorithm is not available for the requested encoding.  Otherwise,
@@ -60,14 +60,9 @@ void                sb_stemmer_delete(struct sb_stemmer * stemmer);
  *  If an out-of-memory error occurs, this will return NULL.
  */
 const sb_symbol *   sb_stemmer_stem(struct sb_stemmer * stemmer,
-				    const sb_symbol * word, int size);
+                                    const sb_symbol * word, int size);
 
 /** Get the length of the result of the last stemmed word.
  *  This should not be called before sb_stemmer_stem() has been called.
  */
 int                 sb_stemmer_length(struct sb_stemmer * stemmer);
-
-#ifdef __cplusplus
-}
-#endif
-