@@ -19,7 +19,7 @@ extern "C" { #define FRT_BUFFER_SIZE 1024 #if defined(__GNUC__) && !defined(__cplusplus) -# define FRT_INLINE __inline__ +# define FRT_INLINE #else # define FRT_INLINE #endif c/include/global.h @@ -39,7 +39,7 @@ static int cmpd_remove(Store *store, const char *file_name) { (void)store; (void)file_name; - RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG); + RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG); return 0; } @@ -51,7 +51,7 @@ static void cmpd_rename(Store *store, const char *from, const char *to) (void)store; (void)from; (void)to; - RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG); + RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG); } static int cmpd_count(Store *store) @@ -79,7 +79,7 @@ static void cmpd_each(Store *store, static void cmpd_clear(Store *store) { (void)store; - RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG); + RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG); } static void cmpd_close_i(Store *store) @@ -192,7 +192,7 @@ static OutStream *cmpd_new_output(Store *store, const char *file_name) { (void)store; (void)file_name; - RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG); + RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG); return NULL; } @@ -200,14 +200,14 @@ static Lock *cmpd_open_lock_i(Store *store, const char *lock_name) { (void)store; (void)lock_name; - RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG); + RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG); return NULL; } static void cmpd_close_lock_i(Lock *lock) { (void)lock; - RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG); + RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG); } Store *open_cmpd_store(Store *store, const char *name) c/src/compound_io.c @@ -303,7 +303,7 @@ static void fsi_seek_i(InStream *is, off_t pos) static void fsi_close_i(InStream *is) { if (close(is->file.fd)) { - RAISE(IO_ERROR, strerror(errno)); + RAISE(IO_ERROR, "%s", strerror(errno)); } free(is->d.path); } c/src/fs_store.c @@ -229,7 +229,7 @@ static INLINE void index_del_doc_with_key_i(Index *self, Document *doc, td = searcher_search(self->sea, q, 0, 1, NULL, NULL, NULL); if (td->total_hits > 1) { td_destroy(td); - RAISE(ARG_ERROR, NON_UNIQUE_KEY_ERROR_MSG); + RAISE(ARG_ERROR, "%s", NON_UNIQUE_KEY_ERROR_MSG); } else if (td->total_hits == 1) { ir_delete_doc(self->ir, td->hits[0]->doc); } c/src/ind.c @@ -114,7 +114,7 @@ static Query *wcq_rewrite(Query *self, IndexReader *ir) const char *term = te->curr_term; const char *pat_term = term + prefix_len; do { - if (prefix && strncmp(term, prefix, prefix_len) != 0) { + if (prefix[0] && strncmp(term, prefix, prefix_len) != 0) { break; } c/src/q_wildcard.c @@ -1314,7 +1314,7 @@ static int cdfsea_doc_freq(Searcher *self, Symbol field, const char *text) static Document *cdfsea_get_doc(Searcher *self, int doc_num) { (void)self; (void)doc_num; - RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG); + RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG); return NULL; } @@ -1327,7 +1327,7 @@ static int cdfsea_max_doc(Searcher *self) static Weight *cdfsea_create_weight(Searcher *self, Query *query) { (void)self; (void)query; - RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG); + RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG); return NULL; } @@ -1336,7 +1336,7 @@ static TopDocs *cdfsea_search_w(Searcher *self, Weight *w, int fd, int nd, { (void)self; (void)w; (void)fd; (void)nd; (void)f; (void)s; (void)pf; (void)load; - RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG); + RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG); return NULL; } @@ -1345,7 +1345,7 @@ static TopDocs *cdfsea_search(Searcher *self, Query *q, int fd, int nd, { (void)self; (void)q; (void)fd; (void)nd; (void)f; (void)s; (void)pf; (void)load; - RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG); + RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG); return NULL; } @@ -1355,7 +1355,7 @@ static void cdfsea_search_each(Searcher *self, Query *query, Filter *filter, void *arg) { (void)self; (void)query; (void)filter; (void)pf; (void)fn; (void)arg; - RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG); + RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG); } static void cdfsea_search_each_w(Searcher *self, Weight *w, Filter *filter, @@ -1364,7 +1364,7 @@ static void cdfsea_search_each_w(Searcher *self, Weight *w, Filter *filter, void *arg) { (void)self; (void)w; (void)filter; (void)pf; (void)fn; (void)arg; - RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG); + RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG); } static Query *cdfsea_rewrite(Searcher *self, Query *original) @@ -1377,14 +1377,14 @@ static Query *cdfsea_rewrite(Searcher *self, Query *original) static Explanation *cdfsea_explain(Searcher *self, Query *query, int doc_num) { (void)self; (void)query; (void)doc_num; - RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG); + RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG); return NULL; } static Explanation *cdfsea_explain_w(Searcher *self, Weight *w, int doc_num) { (void)self; (void)w; (void)doc_num; - RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG); + RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG); return NULL; } @@ -1392,7 +1392,7 @@ static TermVector *cdfsea_get_term_vector(Searcher *self, const int doc_num, Symbol field) { (void)self; (void)doc_num; (void)field; - RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG); + RAISE(UNSUPPORTED_ERROR, "%s", UNSUPPORTED_ERROR_MSG); return NULL; } c/src/search.c @@ -4,83 +4,83 @@ #include "test.h" -TestSuite *ts_fields(TestSuite *suite); -TestSuite *ts_file_deleter(TestSuite *suite); -TestSuite *ts_multimapper(TestSuite *suite); -TestSuite *ts_q_filtered(TestSuite *suite); -TestSuite *ts_filter(TestSuite *suite); -TestSuite *ts_hashset(TestSuite *suite); -TestSuite *ts_compound_io(TestSuite *suite); -TestSuite *ts_document(TestSuite *suite); -TestSuite *ts_global(TestSuite *suite); -TestSuite *ts_hash(TestSuite *suite); +TestSuite *ts_analysis(TestSuite *suite); TestSuite *ts_search(TestSuite *suite); TestSuite *ts_multi_search(TestSuite *suite); -TestSuite *ts_lang(TestSuite *suite); -TestSuite *ts_symbol(TestSuite *suite); +TestSuite *ts_except(TestSuite *suite); +TestSuite *ts_similarity(TestSuite *suite); +TestSuite *ts_term_vectors(TestSuite *suite); TestSuite *ts_priorityqueue(TestSuite *suite); -TestSuite *ts_q_parser(TestSuite *suite); +TestSuite *ts_helper(TestSuite *suite); +TestSuite *ts_index(TestSuite *suite); TestSuite *ts_highlighter(TestSuite *suite); -TestSuite *ts_q_fuzzy(TestSuite *suite); -TestSuite *ts_fs_store(TestSuite *suite); +TestSuite *ts_q_span(TestSuite *suite); TestSuite *ts_q_const_score(TestSuite *suite); +TestSuite *ts_file_deleter(TestSuite *suite); +TestSuite *ts_multimapper(TestSuite *suite); +TestSuite *ts_test(TestSuite *suite); +TestSuite *ts_document(TestSuite *suite); TestSuite *ts_sort(TestSuite *suite); +TestSuite *ts_lang(TestSuite *suite); +TestSuite *ts_global(TestSuite *suite); TestSuite *ts_term(TestSuite *suite); -TestSuite *ts_test(TestSuite *suite); -TestSuite *ts_q_span(TestSuite *suite); -TestSuite *ts_segments(TestSuite *suite); -TestSuite *ts_array(TestSuite *suite); -TestSuite *ts_term_vectors(TestSuite *suite); -TestSuite *ts_threading(TestSuite *suite); -TestSuite *ts_ram_store(TestSuite *suite); -TestSuite *ts_analysis(TestSuite *suite); -TestSuite *ts_index(TestSuite *suite); +TestSuite *ts_fields(TestSuite *suite); +TestSuite *ts_fs_store(TestSuite *suite); +TestSuite *ts_symbol(TestSuite *suite); +TestSuite *ts_q_parser(TestSuite *suite); TestSuite *ts_bitvector(TestSuite *suite); -TestSuite *ts_except(TestSuite *suite); +TestSuite *ts_compound_io(TestSuite *suite); TestSuite *ts_mem_pool(TestSuite *suite); -TestSuite *ts_similarity(TestSuite *suite); -TestSuite *ts_helper(TestSuite *suite); +TestSuite *ts_ram_store(TestSuite *suite); +TestSuite *ts_array(TestSuite *suite); +TestSuite *ts_threading(TestSuite *suite); +TestSuite *ts_segments(TestSuite *suite); +TestSuite *ts_filter(TestSuite *suite); +TestSuite *ts_hashset(TestSuite *suite); +TestSuite *ts_q_fuzzy(TestSuite *suite); +TestSuite *ts_q_filtered(TestSuite *suite); +TestSuite *ts_hash(TestSuite *suite); const struct test_list { TestSuite *(*func)(TestSuite *suite); } all_tests[] = { - {ts_fields}, - {ts_file_deleter}, - {ts_multimapper}, - {ts_q_filtered}, - {ts_filter}, - {ts_hashset}, - {ts_compound_io}, - {ts_document}, - {ts_global}, - {ts_hash}, + {ts_analysis}, {ts_search}, {ts_multi_search}, - {ts_lang}, - {ts_symbol}, + {ts_except}, + {ts_similarity}, + {ts_term_vectors}, {ts_priorityqueue}, - {ts_q_parser}, + {ts_helper}, + {ts_index}, {ts_highlighter}, - {ts_q_fuzzy}, - {ts_fs_store}, + {ts_q_span}, {ts_q_const_score}, + {ts_file_deleter}, + {ts_multimapper}, + {ts_test}, + {ts_document}, {ts_sort}, + {ts_lang}, + {ts_global}, {ts_term}, - {ts_test}, - {ts_q_span}, - {ts_segments}, - {ts_array}, - {ts_term_vectors}, - {ts_threading}, - {ts_ram_store}, - {ts_analysis}, - {ts_index}, + {ts_fields}, + {ts_fs_store}, + {ts_symbol}, + {ts_q_parser}, {ts_bitvector}, - {ts_except}, + {ts_compound_io}, {ts_mem_pool}, - {ts_similarity}, - {ts_helper} + {ts_ram_store}, + {ts_array}, + {ts_threading}, + {ts_segments}, + {ts_filter}, + {ts_hashset}, + {ts_q_fuzzy}, + {ts_q_filtered}, + {ts_hash} }; #endif c/test/all_tests.h @@ -6,7 +6,7 @@ static char *msg2 = "Message Two"; static void raise_exception() { - RAISE(EXCEPTION, msg1); + RAISE(EXCEPTION, "%s", msg1); } static void inner_try(TestCase *tc) @@ -23,7 +23,7 @@ static void inner_try(TestCase *tc) Astrstr(xcontext.msg, msg1); exception_handled = true; HANDLED(); - RAISE(IO_ERROR, msg2); + RAISE(IO_ERROR, "%s", msg2); Assert(false, "Exception should have been raised"); break; case IO_ERROR: @@ -33,7 +33,7 @@ static void inner_try(TestCase *tc) Assert(false, "Exception should have been known"); break; case FINALLY: - Assert(exception_handled, "Exception wasn't handled"); + Assert(exception_handled, "%s", "Exception wasn't handled"); Assert(ioerror_called, "IO_ERROR wasn't called"); ENDTRY } @@ -136,7 +136,7 @@ static void try_xfinally1(TestCase *tc) TRY Assert(true, "No exception raised"); XFINALLY - RAISE(EXCEPTION, msg1); + RAISE(EXCEPTION, "%s", msg1); finally_handled = true; XENDTRY Assert(finally_handled, "Finally wasn't handled"); @@ -148,10 +148,10 @@ static void try_xfinally2(TestCase *tc) bool finally_handled = false; TRY - RAISE(EXCEPTION, msg1); + RAISE(EXCEPTION, "%s", msg1); Assert(false, "Exception should have been raised"); XFINALLY - RAISE(EXCEPTION, msg1); + RAISE(EXCEPTION, "%s", msg1); finally_handled = true; XENDTRY Assert(finally_handled, "Finally wasn't handled"); @@ -163,11 +163,11 @@ static void try_xcatchall(TestCase *tc) bool catchall_handled = false; TRY - RAISE(EXCEPTION, msg1); + RAISE(EXCEPTION, "%s", msg1); Assert(false, "Exception should have been raised"); XCATCHALL HANDLED(); - RAISE(EXCEPTION, msg1); + RAISE(EXCEPTION, "%s", msg1); catchall_handled = true; XENDTRY Assert(catchall_handled, "Finally wasn't handled"); c/test/test_except.c @@ -205,7 +205,7 @@ static void test_hash_ptr(TestCase *tc, void *data) char buf[100]; (void)data; /* suppress unused argument warning */ - Aiequal(ptr_hash(word1), intern("one")); + Aiequal(ptr_hash(word1), (unsigned long)intern("one")); Atrue(ptr_eq(word1, intern("one"))); h_set(h, word1, estrdup("1")); h_set(h, word2, estrdup("2")); c/test/test_hash.c @@ -374,7 +374,7 @@ static void test_tv_multi_doc(TestCase *tc, void *data) } for (i = 0; i < NUM_TERMS; i++) { char buf[100]; - int len = sprintf(buf, tv->terms[i].text); + int len = sprintf(buf, "%s", tv->terms[i].text); assert(strlen(tv->terms[i].text) < 100); Aiequal(i, tv_get_term_index(tv, buf)); c/test/test_term_vectors.c @@ -2450,7 +2450,7 @@ frb_ir_is_latest(VALUE self) * index_reader.term_vector(doc_id, field) -> TermVector * * Return the TermVector for the field +field+ in the document at +doc_id+ in - * the index. Return nil of no such term_vector exists. See TermVector. + * the index. Return nil if no such term_vector exists. See TermVector. */ static VALUE frb_ir_term_vector(VALUE self, VALUE rdoc_id, VALUE rfield) @@ -3091,7 +3091,7 @@ Init_TVTerm(void) * * == Example * - * tv = index_reader.term_vector(:content) + * tv = index_reader.term_vector(doc_id, :content) * tv_term = tv.find {|tvt| tvt.term = "fox"} * * # get the term frequency ruby/ext/r_index.c 95f894c8e05ab7c33545275ac55eadba8e63f093 David Balmain dave@x60.(none) http://github.com/dbalmain/ferret/commit/6e77ee4b21495912b29d805791443a7fc3441ddd 6e77ee4b21495912b29d805791443a7fc3441ddd 2009-01-01T21:50:42-08:00 2009-01-01T21:50:42-08:00 Fixed gcc 4.3 errors cce27d3160ac7bc54afba66675d0252959d6cfcc David Balmain dave@x60.(none)