ferret 0.11.8.6 → 0.11.8.7

data/ext/global.h

@@ -104,6 +104,8 @@ extern char *frt_estrcat(char *str, char *str_cat);
 extern void frt_weprintf(const char *fmt, ...);
 extern char *frt_epstrdup(const char *fmt, int len, ...);
 
+extern char *frt_strapp(char *dst, const char *src);
+
 extern const char *FRT_EMPTY_STRING;
 
 extern int frt_scmp(const void *p1, const void *p2);

data/ext/index.c

@@ -105,7 +105,10 @@ static u64 str36_to_u64(char *p)
  * @param ext extension of the filename (including .)
  * @param gen generation
  */
-char *fn_for_generation(char *buf, char *base, char *ext, i64 gen)
+char *fn_for_generation(char *buf,
+                        const char *base,
+                        const char *ext,
+                        i64 gen)
 {
     if (-1 == gen) {
         return NULL;
@@ -872,7 +875,7 @@ static void sis_find_segments_file(Store *store, FindSegmentsFile *fsf,
                 XENDTRY
 
                 if (NULL != gen_is) {
-                    i64 gen0 = -1, gen1 = -1;
+                    volatile i64 gen0 = -1, gen1 = -1;
 
                     TRY
                         gen0 = is_read_u64(gen_is);
@@ -1080,7 +1083,7 @@ static void sis_read_i(Store *store, FindSegmentsFile *fsf)
 {
     int seg_cnt;
     int i;
-    bool success = false;
+    volatile bool success = false;
     char seg_file_name[SEGMENT_NAME_MAX_LENGTH];
     InStream *volatile is = NULL;
     SegmentInfos *volatile sis = ALLOC_AND_ZERO(SegmentInfos);
@@ -1166,7 +1169,6 @@ void sis_write(SegmentInfos *sis, Store *store, Deleter *deleter)
 static void sis_read_ver_i(Store *store, FindSegmentsFile *fsf)
 {
     InStream *is;
-    u32 format = 0;
     u64 version = 0;
     char seg_file_name[SEGMENT_NAME_MAX_LENGTH];
 
@@ -1174,7 +1176,7 @@ static void sis_read_ver_i(Store *store, FindSegmentsFile *fsf)
     is = store->open_input(store, seg_file_name);
 
     TRY
-        format = is_read_u32(is);
+        is_read_u32(is); // format
         version = is_read_u64(is);
     XFINALLY
         is_close(is);
@@ -1334,6 +1336,11 @@ static void zraise(int ret)
     }
 }
 
+void bz_internal_error(int errcode)
+{
+    zraise(errcode);
+}
+
 static char *is_read_zipped_bytes(InStream *is, int zip_len, int *len)
 {
     int buf_out_idx = 0, ret, read_len;
@@ -4362,7 +4369,7 @@ static void bv_write(BitVector *bv, Store *store, char *name)
 static BitVector *bv_read(Store *store, char *name)
 {
     int i;
-    bool success = false;
+    volatile bool success = false;
     InStream *volatile is = store->open_input(store, name);
     BitVector *volatile bv = ALLOC_AND_ZERO(BitVector);
     bv->size = (int)is_read_vint(is);

data/ext/index.h

@@ -211,7 +211,10 @@ typedef struct FrtSegmentInfos
     int capa;
 } FrtSegmentInfos;
 
-extern char *frt_fn_for_generation(char *buf, char *base, char *ext, frt_i64 gen);
+extern char *frt_fn_for_generation(char *buf,
+                                   const char *base,
+                                   const char *ext,
+                                   frt_i64 gen);
 
 extern FrtSegmentInfos *frt_sis_new(FrtFieldInfos *fis);
 extern FrtSegmentInfo *frt_sis_new_segment(FrtSegmentInfos *sis, int dcnt, FrtStore *store);

data/ext/internal.h

@@ -926,6 +926,7 @@
 #define store_to_s                                     frt_store_to_s
 #define stpe_new                                       frt_stpe_new
 #define str_hash                                       frt_str_hash
+#define strapp                                         frt_strapp
 #define strfmt                                         frt_strfmt
 #define strsort                                        frt_strsort
 #define sym_hash                                       frt_sym_hash

data/ext/multimapper.c

@@ -177,7 +177,7 @@ static DeterministicState *mulmap_process_state(MultiMapper *self, BitVector *bv
         }
         self->dstates[self->d_size++] = current_state;
         start_ds = self->dstates[0];
-        for (i = 0; i <= 256; i++) {
+        for (i = 0; i < 256; i++) {
             current_state->next[i] = start_ds;
         }
         while ((bit = bv_scan_next(bv)) >= 0) {

data/ext/q_fuzzy.c

@@ -208,7 +208,7 @@ static Query *fuzq_rewrite(Query *self, IndexReader *ir)
     fuzq->scale_factor = (float)(1.0 / (1.0 - fuzq->min_sim));
     fuzq->text = term + pre_len;
     fuzq->text_len = (int)strlen(fuzq->text);
-    fuzq->da = REALLOC_N(fuzq->da, int, fuzq->text_len * 2 + 2);
+    REALLOC_N(fuzq->da, int, fuzq->text_len * 2 + 2);
     fuzq_initialize_max_distances(fuzq);
 
     do {
@@ -261,6 +261,7 @@ Query *fuzq_new_conf(Symbol field, const char *term,
     FzQ(self)->term       = estrdup(term);
     FzQ(self)->pre_len    = pre_len ? pre_len : DEF_PRE_LEN;
     FzQ(self)->min_sim    = min_sim ? min_sim : DEF_MIN_SIM;
+    FzQ(self)->da         = NULL;
     MTQMaxTerms(self)     = max_terms ? max_terms : DEF_MAX_TERMS;
 
     self->type            = FUZZY_QUERY;

data/ext/q_span.c

@@ -1430,7 +1430,7 @@ static Explanation *spanw_explain(Weight *self, IndexReader *ir, int target)
         doc_freqs[df_i] = '\0';
     }
     else {
-        doc_freqs = "";
+        doc_freqs = estrdup("");
     }
 
     expl = expl_new(0.0, "weight(%s in %d), product of:", query_str, target);

data/ext/r_analysis.c

@@ -1186,7 +1186,7 @@ static VALUE
 frb_stem_filter_init(int argc, VALUE *argv, VALUE self) 
 {
     VALUE rsub_ts, ralgorithm, rcharenc;
-    char *algorithm = "english";
+    const char *algorithm = "english";
     char *charenc = NULL;
     TokenStream *ts;
     rb_scan_args(argc, argv, "12", &rsub_ts, &ralgorithm, &rcharenc);

data/ext/r_index.c

@@ -212,7 +212,7 @@ static VALUE
 frb_fi_name(VALUE self)
 {
     FieldInfo *fi = (FieldInfo *)DATA_PTR(self);
-    return ID2SYM(fi->name);
+    return FSYM2SYM(fi->name);
 }
 
 /*
@@ -1094,7 +1094,7 @@ frb_tde_to_json(int argc, VALUE *argv, VALUE self)
     VALUE rjson;
     char *json, *jp;
     int capa = 65536;
-    char *format;
+    const char *format;
     char close = (argc > 0) ? ']' : '}';
     bool do_positions = tde->next_position != NULL;
     jp = json = ALLOC_N(char, capa);

data/ext/r_qparser.c

@@ -154,7 +154,6 @@ frb_qp_init(int argc, VALUE *argv, VALUE self)
     VALUE roptions = Qnil;
     VALUE rval;
     Analyzer *analyzer = NULL;
-    bool has_options = false;
 
     HashSet *all_fields = NULL;
     HashSet *tkz_fields = NULL;
@@ -163,7 +162,6 @@ frb_qp_init(int argc, VALUE *argv, VALUE self)
 
     if (rb_scan_args(argc, argv, "01", &roptions) > 0) {
         if (TYPE(roptions) == T_HASH) {
-            has_options = true;
             if (Qnil != (rval = rb_hash_aref(roptions, sym_default_field))) {
                 def_fields = frb_get_fields(rval);
             }
@@ -253,7 +251,7 @@ frb_qp_init(int argc, VALUE *argv, VALUE self)
 static VALUE
 frb_qp_parse(VALUE self, VALUE rstr)
 {
-    const char *msg = NULL;
+    const char *volatile msg = NULL;
     volatile VALUE rq;
     GET_QP;
     rstr = rb_obj_as_string(rstr);

data/ext/r_search.c

@@ -197,7 +197,7 @@ frb_td_to_s(int argc, VALUE *argv, VALUE self)
     VALUE rhits = rb_funcall(self, id_hits, 0);
     Searcher *sea = (Searcher *)DATA_PTR(rb_funcall(self, id_searcher, 0));
     const int len = RARRAY_LEN(rhits);
-    int capa = len * 64 + 100;
+    unsigned int capa = len * 64 + 100;
     int p = 0;
     char *str = ALLOC_N(char, len * 64 + 100);
     Symbol field = fsym_id;
@@ -215,7 +215,7 @@ frb_td_to_s(int argc, VALUE *argv, VALUE self)
     for (i = 0; i < len; i++) {
         VALUE rhit = RARRAY_PTR(rhits)[i];
         int doc_id = FIX2INT(rb_funcall(rhit, id_doc, 0));
-        char *value = "";
+        const char *value = "";
         size_t value_len = 0;
         LazyDoc *lzd = sea->get_lazy_doc(sea, doc_id);
         LazyDocField *lzdf = lazy_doc_get(lzd, field);
@@ -923,7 +923,8 @@ static VALUE
 frb_bc_to_s(VALUE self)
 {
     VALUE rstr;
-    char *qstr, *ostr = "", *str;
+    char *qstr, *str;
+    const char *ostr = "";
     int len;
     GET_BC();
     qstr = bc->query->to_s(bc->query, NULL);
@@ -2984,9 +2985,9 @@ frb_sea_highlight(int argc, VALUE *argv, VALUE self)
     Query *query;
     int excerpt_length = 150;
     int num_excerpts = 2;
-    char *pre_tag = "<b>";
-    char *post_tag = "</b>";
-    char *ellipsis = "...";
+    const char *pre_tag = "<b>";
+    const char *post_tag = "</b>";
+    const char *ellipsis = "...";
     char **excerpts;
 
     rb_scan_args(argc, argv, "31", &rquery, &rdoc_id, &rfield, &roptions);

data/ext/r_store.c

@@ -75,6 +75,7 @@ frb_lock_obtain(int argc, VALUE *argv, VALUE self)
         timeout = FIX2INT(rtimeout);
     }
     /* TODO: use the lock timeout */
+    (void)timeout;
     if (!lock->obtain(lock)) {
         rb_raise(cLockError, "could not obtain lock: #%s", lock->name);
     }
@@ -105,6 +106,7 @@ frb_lock_while_locked(int argc, VALUE *argv, VALUE self)
     if (rb_scan_args(argc, argv, "01", &rtimeout) > 0) {
         timeout = FIX2INT(rtimeout);
     }
+    (void)timeout;
     if (!lock->obtain(lock)) {
         rb_raise(cLockError, "could not obtain lock: #%s", lock->name);
     }

data/ext/scanner.c

@@ -1,3 +1,4 @@
+
 #line 1 "src/scanner.rl"
 /* scanner.rl -*-C-*- */
 #include <ctype.h>
@@ -15,11 +16,12 @@
     goto ret;         \
 } while(0)
 
+
 #line 28 "src/scanner.rl"
 
 
 
-#line 23 "src/scanner.c"
+#line 25 "src/scanner.c"
 static const char _StdTok_actions[] = {
 	0, 1, 0, 1, 1, 1, 2, 1, 
 	3, 1, 4, 1, 5, 1, 17, 1, 
@@ -529,6 +531,7 @@ static const int StdTok_error = 0;
 static const int StdTok_en_frt_tokenizer = 35;
 static const int StdTok_en_main = 1;
 
+
 #line 31 "src/scanner.rl"
 
 void frt_std_scan(const char *in,
@@ -542,7 +545,7 @@ void frt_std_scan(const char *in,
     char *ts = 0, *te = 0;
 
     
-#line 546 "src/scanner.c"
+#line 549 "src/scanner.c"
 	{
 	cs = StdTok_start;
 	top = 0;
@@ -550,6 +553,7 @@ void frt_std_scan(const char *in,
 	te = 0;
 	act = 0;
 	}
+
 #line 43 "src/scanner.rl"
 
     char *p = (char *)in, *pe = 0, *eof = pe;
@@ -562,7 +566,7 @@ void frt_std_scan(const char *in,
     *token_size = 0;
 
     
-#line 566 "src/scanner.c"
+#line 570 "src/scanner.c"
 	{
 	int _klen;
 	unsigned int _trans;
@@ -580,10 +584,10 @@ _resume:
 	while ( _nacts-- > 0 ) {
 		switch ( *_acts++ ) {
 	case 4:
-#line 1 "src/scanner.rl"
+#line 1 "NONE"
 	{ts = p;}
 	break;
-#line 587 "src/scanner.c"
+#line 591 "src/scanner.c"
 		}
 	}
 
@@ -605,7 +609,7 @@ _resume:
 			else if ( (*p) > *_mid )
 				_lower = _mid + 1;
 			else {
-				_trans += (_mid - _keys);
+				_trans += (unsigned int)(_mid - _keys);
 				goto _match;
 			}
 		}
@@ -628,7 +632,7 @@ _resume:
 			else if ( (*p) > _mid[1] )
 				_lower = _mid + 2;
 			else {
-				_trans += ((_mid - _keys)>>1);
+				_trans += (unsigned int)((_mid - _keys)>>1);
 				goto _match;
 			}
 		}
@@ -650,11 +654,11 @@ _eof_trans:
 		switch ( *_acts++ )
 		{
 	case 0:
-#line 14 "src/scanner.rl"
+#line 14 "src/url.rl"
 	{ skip = p - ts; }
 	break;
 	case 1:
-#line 26 "src/scanner.rl"
+#line 26 "src/url.rl"
 	{ trunc = 1; }
 	break;
 	case 2:
@@ -662,135 +666,135 @@ _eof_trans:
 	{ p--; {stack[top++] = cs; cs = 35; goto _again;} }
 	break;
 	case 5:
-#line 1 "src/scanner.rl"
+#line 1 "NONE"
 	{te = p+1;}
 	break;
 	case 6:
-#line 15 "src/scanner.rl"
+#line 15 "src/scanner.in"
 	{act = 2;}
 	break;
 	case 7:
-#line 16 "src/scanner.rl"
+#line 16 "src/scanner.in"
 	{act = 3;}
 	break;
 	case 8:
-#line 17 "src/scanner.rl"
+#line 17 "src/scanner.in"
 	{act = 4;}
 	break;
 	case 9:
-#line 20 "src/scanner.rl"
+#line 20 "src/scanner.in"
 	{act = 5;}
 	break;
 	case 10:
-#line 23 "src/scanner.rl"
+#line 23 "src/scanner.in"
 	{act = 6;}
 	break;
 	case 11:
-#line 26 "src/scanner.rl"
+#line 26 "src/scanner.in"
 	{act = 7;}
 	break;
 	case 12:
-#line 29 "src/scanner.rl"
+#line 29 "src/scanner.in"
 	{act = 8;}
 	break;
 	case 13:
-#line 32 "src/scanner.rl"
+#line 32 "src/scanner.in"
 	{act = 9;}
 	break;
 	case 14:
-#line 35 "src/scanner.rl"
+#line 35 "src/scanner.in"
 	{act = 10;}
 	break;
 	case 15:
-#line 36 "src/scanner.rl"
+#line 36 "src/scanner.in"
 	{act = 11;}
 	break;
 	case 16:
-#line 40 "src/scanner.rl"
+#line 40 "src/scanner.in"
 	{act = 13;}
 	break;
 	case 17:
-#line 12 "src/scanner.rl"
+#line 12 "src/scanner.in"
 	{te = p+1;{ RET; }}
 	break;
 	case 18:
-#line 29 "src/scanner.rl"
+#line 29 "src/scanner.in"
 	{te = p+1;{ RET; }}
 	break;
 	case 19:
-#line 39 "src/scanner.rl"
+#line 39 "src/scanner.in"
 	{te = p+1;{ return; }}
 	break;
 	case 20:
-#line 40 "src/scanner.rl"
+#line 40 "src/scanner.in"
 	{te = p+1;}
 	break;
 	case 21:
-#line 12 "src/scanner.rl"
+#line 12 "src/scanner.in"
 	{te = p;p--;{ RET; }}
 	break;
 	case 22:
-#line 15 "src/scanner.rl"
+#line 15 "src/scanner.in"
 	{te = p;p--;{ RET; }}
 	break;
 	case 23:
-#line 16 "src/scanner.rl"
+#line 16 "src/scanner.in"
 	{te = p;p--;{ trunc = 1; RET; }}
 	break;
 	case 24:
-#line 23 "src/scanner.rl"
+#line 23 "src/scanner.in"
 	{te = p;p--;{ RET; }}
 	break;
 	case 25:
-#line 26 "src/scanner.rl"
+#line 26 "src/scanner.in"
 	{te = p;p--;{ RET; }}
 	break;
 	case 26:
-#line 29 "src/scanner.rl"
+#line 29 "src/scanner.in"
 	{te = p;p--;{ RET; }}
 	break;
 	case 27:
-#line 32 "src/scanner.rl"
+#line 32 "src/scanner.in"
 	{te = p;p--;{ STRIP('.'); }}
 	break;
 	case 28:
-#line 35 "src/scanner.rl"
+#line 35 "src/scanner.in"
 	{te = p;p--;{ RET; }}
 	break;
 	case 29:
-#line 36 "src/scanner.rl"
+#line 36 "src/scanner.in"
 	{te = p;p--;{ RET; }}
 	break;
 	case 30:
-#line 40 "src/scanner.rl"
+#line 40 "src/scanner.in"
 	{te = p;p--;}
 	break;
 	case 31:
-#line 12 "src/scanner.rl"
+#line 12 "src/scanner.in"
 	{{p = ((te))-1;}{ RET; }}
 	break;
 	case 32:
-#line 15 "src/scanner.rl"
+#line 15 "src/scanner.in"
 	{{p = ((te))-1;}{ RET; }}
 	break;
 	case 33:
-#line 23 "src/scanner.rl"
+#line 23 "src/scanner.in"
 	{{p = ((te))-1;}{ RET; }}
 	break;
 	case 34:
-#line 29 "src/scanner.rl"
+#line 29 "src/scanner.in"
 	{{p = ((te))-1;}{ RET; }}
 	break;
 	case 35:
-#line 35 "src/scanner.rl"
+#line 35 "src/scanner.in"
 	{{p = ((te))-1;}{ RET; }}
 	break;
 	case 36:
-#line 40 "src/scanner.rl"
+#line 40 "src/scanner.in"
 	{{p = ((te))-1;}}
 	break;
 	case 37:
-#line 1 "src/scanner.rl"
+#line 1 "NONE"
 	{	switch( act ) {
 	case 2:
 	{{p = ((te))-1;} RET; }
@@ -828,7 +832,7 @@ _eof_trans:
 	}
 	}
 	break;
-#line 832 "src/scanner.c"
+#line 836 "src/scanner.c"
 		}
 	}
 
@@ -838,10 +842,10 @@ _again:
 	while ( _nacts-- > 0 ) {
 		switch ( *_acts++ ) {
 	case 3:
-#line 1 "src/scanner.rl"
+#line 1 "NONE"
 	{ts = 0;}
 	break;
-#line 845 "src/scanner.c"
+#line 849 "src/scanner.c"
 		}
 	}
 
@@ -860,6 +864,7 @@ _again:
 
 	_out: {}
 	}
+
 #line 54 "src/scanner.rl"
 
     if ( cs == StdTok_error )