@@ -990,7 +990,8 @@ frb_stop_filter_init(int argc, VALUE *argv, VALUE self) return self; } -static INLINE void frb_add_mapping_i(TokenStream *mf, VALUE from, char *to) +static INLINE void frb_add_mapping_i(TokenStream *mf, VALUE from, + const char *to) { switch (TYPE(from)) { case T_STRING: @@ -1013,7 +1014,7 @@ static int frb_add_mappings_i(VALUE key, VALUE value, VALUE arg) return ST_CONTINUE; } else { TokenStream *mf = (TokenStream *)arg; - char *to; + const char *to; switch (TYPE(value)) { case T_STRING: to = rs2s(value); ruby/ext/r_analysis.c @@ -1499,7 +1499,8 @@ frb_get_doc(VALUE rdoc) } break; case T_SYMBOL: - df = df_add_data(df_new(fsym_content), rb_id2name(SYM2ID(rdoc))); + /* TODO: clean up this ugly cast */ + df = df_add_data(df_new(fsym_content), (char *)rb_id2name(SYM2ID(rdoc))); doc_add_field(doc, df); break; case T_STRING: ruby/ext/r_index.c @@ -204,7 +204,7 @@ frb_td_to_s(int argc, VALUE *argv, VALUE self) field = frb_field(argv[0]); } - sprintf(str, "TopDocs: total_hits = %ld, max_score = %f [\n", + sprintf(str, "TopDocs: total_hits = %d, max_score = %f [\n", FIX2INT(rb_funcall(self, id_total_hits, 0)), NUM2DBL(rb_funcall(self, id_max_score, 0))); p = (int)strlen(str); @@ -261,7 +261,7 @@ frb_lzd_load_to_json(LazyDoc *lzd, char **str, char *s, int *slen) } for (i = 0; i < lzd->size; i++) { - char *field_name; + const char *field_name; f = lzd->fields[i]; field_name = S(f->name); if (i) *(s++) = ','; ruby/ext/r_search.c @@ -586,7 +586,7 @@ frb_mulmap_alloc(VALUE klass) /* XXX: Duplication from frb_add_mapping_i in r_analysis.c */ static INLINE void frb_mulmap_add_mapping_i(MultiMapper *mulmap, VALUE from, - char *to) + const char *to) { switch (TYPE(from)) { case T_STRING: @@ -610,7 +610,7 @@ static int frb_mulmap_add_mappings_i(VALUE key, VALUE value, VALUE arg) return ST_CONTINUE; } else { MultiMapper *mulmap = (MultiMapper *)arg; - char *to; + const char *to; switch (TYPE(value)) { case T_STRING: to = rs2s(value); ruby/ext/r_utils.c 6e77ee4b21495912b29d805791443a7fc3441ddd David Balmain dave@x60.(none) http://github.com/dbalmain/ferret/commit/494e21628fd88d120a8be94f428cf6ba1704d1b5 494e21628fd88d120a8be94f428cf6ba1704d1b5 2009-01-01T22:02:19-08:00 2009-01-01T22:02:19-08:00 Fixed gcc4.3 warnings in ruby bindings 1e3a4a6e405029ed619e38b8da5c94eeb8f1f8f8 David Balmain dave@x60.(none)