isomorfeus-ferret 0.17.2 → 0.17.3

data/ext/isomorfeus_ferret_ext/test_file_deleter.c

@@ -21,44 +21,37 @@ static FrtFieldInfos *prep_fis(void) {
     return frt_fis_new(0 | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM);
 }
 
-static void create_index(FrtStore *store)
-{
+static void create_index(FrtStore *store) {
     FrtFieldInfos *fis = prep_fis();
     frt_index_create(store, fis);
     frt_fis_deref(fis);
 }
 
-static FrtIndexWriter *create_iw_lucene(FrtStore *store)
-{
+static FrtIndexWriter *create_iw_lucene(FrtStore *store) {
     create_index(store);
     return frt_iw_open(NULL, store, frt_whitespace_analyzer_new(false), &lucene_config);
 }
 
-static void add_doc(FrtIndexWriter *iw, int id)
-{
+static void add_doc(FrtIndexWriter *iw, int id) {
     FrtDocument *doc = frt_doc_new();
     rb_encoding *enc = rb_enc_find("ASCII-8BIT");
 
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern(content_f)),
-                                   frt_estrdup("aaa"), enc))->destroy_data = true;
-    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern(id_f)),
-                                   frt_strfmt("%d", id), enc))->destroy_data = true;
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern(content_f)), "aaa", enc));
+    frt_doc_add_field(doc, frt_df_add_data(frt_df_new(rb_intern(id_f)), frt_strfmt("%d", id), enc));
     frt_iw_add_doc(iw, doc);
-   frt_doc_destroy(doc);
+    frt_doc_destroy(doc);
 }
 
-static void add_docs(FrtIndexWriter *iw, int count)
-{
+static void add_docs(FrtIndexWriter *iw, int count) {
     int i;
     for (i = 0; i < count; i++) {
         add_doc(iw, i);
     }
 }
 
-static void copy_file(FrtStore *store, const char *src, const char *dest)
-{
-    FrtInStream *is = store->open_input(store, src);
-    FrtOutStream *os = store->new_output(store, dest);
+static void copy_file(FrtStore *store, const char *src, const char *dest) {
+    FrtInStream *is = store->open_input(store, segm_idx_name, src);
+    FrtOutStream *os = store->new_output(store, segm_idx_name, dest);
     frt_is2os_copy_bytes(is, os, frt_is_length(is));
     frt_is_close(is);
     frt_os_close(os);
@@ -68,8 +61,7 @@ static void copy_file(FrtStore *store, const char *src, const char *dest)
  * Verify we can read the pre-XXX file format, do searches
  * against it, and add documents to it.
  */
-static void test_delete_leftover_files(TestCase *tc, void *data)
-{
+static void test_delete_leftover_files(TestCase *tc, void *data) {
     FrtStore *store = (FrtStore *)data;
     FrtIndexWriter *iw = create_iw_lucene(store);
     FrtIndexReader *ir;
@@ -85,7 +77,7 @@ static void test_delete_leftover_files(TestCase *tc, void *data)
     /* Set one norm so we get a .s0 file: */
     frt_ir_set_norm(ir, 21, rb_intern(content_f), 12);
     frt_ir_close(ir);
-    store_before = frt_store_to_s(store);
+    store_before = frt_store_folder_to_s(store, segm_idx_name);
 
     /* Create a bogus separate norms file for a
      * segment/field that actually has a separate norms file
@@ -127,7 +119,7 @@ static void test_delete_leftover_files(TestCase *tc, void *data)
     /* Open & close a writer: should delete the above files and nothing more: */
     frt_iw_close(frt_iw_open(NULL, store, frt_whitespace_analyzer_new(false), &lucene_config));
 
-    store_after = frt_store_to_s(store);
+    store_after = frt_store_folder_to_s(store, segm_idx_name);
 
     Asequal(store_before, store_after);
     free(store_before);
@@ -140,9 +132,9 @@ static void test_delete_leftover_files(TestCase *tc, void *data)
  *
  ***************************************************************************/
 
-TestSuite *ts_file_deleter(TestSuite *suite)
-{
+TestSuite *ts_file_deleter(TestSuite *suite) {
     FrtStore *store = frt_open_ram_store(NULL);
+    store->create_folder(store, segm_idx_name);
     suite = ADD_SUITE(suite);
 
     tst_run_test(suite, test_delete_leftover_files, store);

data/ext/isomorfeus_ferret_ext/test_filter.c

@@ -15,8 +15,7 @@ struct FilterData {
 
 static ID num, date, flipflop;
 
-void prepare_filter_index(FrtStore *store)
-{
+void prepare_filter_index(FrtStore *store) {
     int i;
     FrtIndexWriter *iw;
     FrtFieldInfos *fis = frt_fis_new(0 | FRT_FI_IS_STORED_BM | FRT_FI_IS_INDEXED_BM | FRT_FI_IS_TOKENIZED_BM);
@@ -46,9 +45,9 @@ void prepare_filter_index(FrtStore *store)
     for (i = 0; i < FILTER_DOCS_SIZE; i++) {
         FrtDocument *doc = frt_doc_new();
         doc->boost = (float)(i+1);
-        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(num), (char *)data[i].num, enc));
-        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(date), (char *)data[i].date, enc));
-        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(flipflop), (char *)data[i].flipflop, enc));
+        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(num), data[i].num, enc));
+        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(date), data[i].date, enc));
+        frt_doc_add_field(doc, frt_df_add_data(frt_df_new(flipflop), data[i].flipflop, enc));
         frt_iw_add_doc(iw, doc);
         frt_doc_destroy(doc);
     }
@@ -56,8 +55,7 @@ void prepare_filter_index(FrtStore *store)
     return;
 }
 
-static void check_filtered_hits(TestCase *tc, FrtSearcher *searcher, FrtQuery *query, FrtFilter *f, FrtPostFilter *post_filter, const char *expected_hits, int top)
-{
+static void check_filtered_hits(TestCase *tc, FrtSearcher *searcher, FrtQuery *query, FrtFilter *f, FrtPostFilter *post_filter, const char *expected_hits, int top) {
     static int num_array[ARRAY_SIZE];
     int i;
     int total_hits = s2l(expected_hits, num_array);
@@ -98,8 +96,7 @@ static void check_filtered_hits(TestCase *tc, FrtSearcher *searcher, FrtQuery *q
         free(fstr);\
     } while (0)
 
-static void test_range_filter(TestCase *tc, void *data)
-{
+static void test_range_filter(TestCase *tc, void *data) {
     FrtSearcher *searcher = (FrtSearcher *)data;
     FrtQuery *q = frt_maq_new();
     FrtFilter *rf = frt_rfilt_new(num, "2", "6", true, true);
@@ -137,8 +134,7 @@ static void test_range_filter(TestCase *tc, void *data)
     frt_q_deref(q);
 }
 
-static void test_range_filter_hash(TestCase *tc, void *data)
-{
+static void test_range_filter_hash(TestCase *tc, void *data) {
     FrtFilter *f1, *f2;
     (void)data;
     f1 = frt_rfilt_new(date, "20051006", "20051010", true, true);
@@ -193,8 +189,7 @@ static void test_range_filter_hash(TestCase *tc, void *data)
     frt_filt_deref(f1);
 }
 
-static void test_query_filter(TestCase *tc, void *data)
-{
+static void test_query_filter(TestCase *tc, void *data) {
     FrtSearcher *searcher = (FrtSearcher *)data;
     FrtQuery *bq;
     FrtFilter *qf;
@@ -216,8 +211,7 @@ static void test_query_filter(TestCase *tc, void *data)
     frt_q_deref(q);
 }
 
-static void test_query_filter_hash(TestCase *tc, void *data)
-{
+static void test_query_filter_hash(TestCase *tc, void *data) {
     FrtFilter *f1, *f2;
     (void)data;
     f1 = frt_qfilt_new_nr(frt_tq_new(rb_intern("A"), "a"));
@@ -241,12 +235,11 @@ static void test_query_filter_hash(TestCase *tc, void *data)
     frt_filt_deref(f1);
 }
 
-static float odd_number_filter(int doc_num, float score, FrtSearcher *sea, void *arg)
-{
+static float odd_number_filter(int doc_num, float score, FrtSearcher *sea, void *arg) {
     float is_ok = 0.0;
     FrtLazyDoc *lazy_doc = frt_searcher_get_lazy_doc(sea, doc_num);
     FrtLazyDocField *lazy_df = frt_lazy_doc_get(lazy_doc, rb_intern("num"));
-    char *num = frt_lazy_df_get_data(lazy_df, 0);
+    const char *num = frt_lazy_df_get_data(lazy_df, 0);
     (void)score;
     (void)arg;
 
@@ -258,13 +251,12 @@ static float odd_number_filter(int doc_num, float score, FrtSearcher *sea, void
     return is_ok;
 }
 
-static float distance_filter(int doc_num, float score, FrtSearcher *sea, void *arg)
-{
+static float distance_filter(int doc_num, float score, FrtSearcher *sea, void *arg) {
     int start_point = *((int *)arg);
     float distance = 0.0;
     FrtLazyDoc *lazy_doc = frt_searcher_get_lazy_doc(sea, doc_num);
     FrtLazyDocField *lazy_df = frt_lazy_doc_get(lazy_doc, rb_intern("num"));
-    char *num = frt_lazy_df_get_data(lazy_df, 0);
+    const char *num = frt_lazy_df_get_data(lazy_df, 0);
     (void)score;
 
     distance = 1.0/(1 + (start_point - atoi(num)) * (start_point - atoi(num)));
@@ -273,8 +265,7 @@ static float distance_filter(int doc_num, float score, FrtSearcher *sea, void *a
     return distance;
 }
 
-static void test_filter_func(TestCase *tc, void *data)
-{
+static void test_filter_func(TestCase *tc, void *data) {
     FrtSearcher *searcher = (FrtSearcher *)data;
     FrtQuery *q = frt_maq_new();
     FrtFilter *rf = frt_rfilt_new(num, "2", "6", true, true);
@@ -290,8 +281,7 @@ static void test_filter_func(TestCase *tc, void *data)
     frt_q_deref(q);
 }
 
-static void test_score_altering_filter_func(TestCase *tc, void *data)
-{
+static void test_score_altering_filter_func(TestCase *tc, void *data) {
     FrtSearcher *searcher = (FrtSearcher *)data;
     FrtQuery *q = frt_maq_new();
     FrtFilter *rf = frt_rfilt_new(num, "4", "8", true, true);
@@ -308,8 +298,7 @@ static void test_score_altering_filter_func(TestCase *tc, void *data)
     frt_q_deref(q);
 }
 
-TestSuite *ts_filter(TestSuite *suite)
-{
+TestSuite *ts_filter(TestSuite *suite) {
     FrtStore *store;
     FrtIndexReader *ir;
     FrtSearcher *searcher;
@@ -317,6 +306,7 @@ TestSuite *ts_filter(TestSuite *suite)
     suite = ADD_SUITE(suite);
 
     store = frt_open_ram_store(NULL);
+    store->create_folder(store, segm_idx_name);
     prepare_filter_index(store);
     ir = frt_ir_open(NULL, store);
     searcher = frt_isea_new(ir);

data/ext/isomorfeus_ferret_ext/test_global.c

@@ -2,13 +2,11 @@
 #include "test.h"
 #define _ISOC99_SOURCE
 #include <math.h>
-#include "fio_tmpfile.h"
 
 /**
  * Test min/max functions
  */
-static void test_min_max(TestCase *tc, void *data)
-{
+static void test_min_max(TestCase *tc, void *data) {
     (void)data; /* suppress unused argument warning */
 
     Aiequal(2, FRT_MAX(2, 1));
@@ -47,8 +45,7 @@ static void test_min_max(TestCase *tc, void *data)
 /**
  * Test icmp
  */
-static void test_icmp(TestCase *tc, void *data)
-{
+static void test_icmp(TestCase *tc, void *data) {
     (void)data; /* suppress unused argument warning */
     int a = 1, b = 2;
     int array[10] = {7,8,6,5,9,2,3,4,1,0};
@@ -65,8 +62,7 @@ static void test_icmp(TestCase *tc, void *data)
 /**
  * Test the various alloc functions
  */
-static void test_alloc(TestCase *tc, void *data)
-{
+static void test_alloc(TestCase *tc, void *data) {
     data = frt_lmalloc(100);
     Aiequal(100, *(unsigned long *)data);
     free(data);
@@ -88,8 +84,7 @@ static void test_alloc(TestCase *tc, void *data)
  * Test the strfmt functions. This method is like sprintf except that it
  * allocates the necessary space for the string and pretty prints floats.
  */
-static void test_strfmt(TestCase *tc, void *data)
-{
+static void test_strfmt(TestCase *tc, void *data) {
     char *s;
     (void)data; /* suppress unused argument warning */
 
@@ -134,8 +129,7 @@ static void test_strfmt(TestCase *tc, void *data)
 /**
  * Test dbl_to_s
  */
-static void test_dbl_to_s(TestCase *tc, void *data)
-{
+static void test_dbl_to_s(TestCase *tc, void *data) {
     (void)data; /* suppress unused argument warning */
     char buf[100];
     Asequal("4.125123", frt_dbl_to_s(buf, 4.125123l));
@@ -145,8 +139,7 @@ static void test_dbl_to_s(TestCase *tc, void *data)
     Asequal("NaN", frt_dbl_to_s(buf, NAN));
 }
 
-static void test_count_leading_zeros(TestCase *tc, void *data)
-{
+static void test_count_leading_zeros(TestCase *tc, void *data) {
     (void)data;
     Aiequal(32, frt_count_leading_zeros(0));
     Aiequal(31, frt_count_leading_zeros(1));
@@ -155,8 +148,7 @@ static void test_count_leading_zeros(TestCase *tc, void *data)
     Aiequal( 0, frt_count_leading_zeros(0xffffffff));
 }
 
-static void test_count_leading_ones(TestCase *tc, void *data)
-{
+static void test_count_leading_ones(TestCase *tc, void *data) {
     (void)data;
     Aiequal( 0, frt_count_leading_ones(0));
     Aiequal( 0, frt_count_leading_ones(1));
@@ -165,8 +157,7 @@ static void test_count_leading_ones(TestCase *tc, void *data)
     Aiequal(32, frt_count_leading_ones(0xffffffff));
 }
 
-static void test_count_trailing_zeros(TestCase *tc, void *data)
-{
+static void test_count_trailing_zeros(TestCase *tc, void *data) {
     (void)data;
     Aiequal(32, frt_count_trailing_zeros(0));
     Aiequal( 0, frt_count_trailing_zeros(1));
@@ -176,8 +167,7 @@ static void test_count_trailing_zeros(TestCase *tc, void *data)
     Aiequal( 0, frt_count_trailing_zeros(0xffffffff));
 }
 
-static void test_count_trailing_ones(TestCase *tc, void *data)
-{
+static void test_count_trailing_ones(TestCase *tc, void *data) {
     (void)data;
     Aiequal( 0, frt_count_trailing_ones(0));
     Aiequal( 1, frt_count_trailing_ones(1));
@@ -187,8 +177,7 @@ static void test_count_trailing_ones(TestCase *tc, void *data)
     Aiequal(32, frt_count_trailing_ones(0xffffffff));
 }
 
-static void test_count_zeros(TestCase *tc, void *data)
-{
+static void test_count_zeros(TestCase *tc, void *data) {
     (void)data;
     Aiequal(32, frt_count_zeros(0));
     Aiequal(31, frt_count_zeros(1));
@@ -198,8 +187,7 @@ static void test_count_zeros(TestCase *tc, void *data)
     Aiequal( 0, frt_count_zeros(0xffffffff));
 }
 
-static void test_count_ones(TestCase *tc, void *data)
-{
+static void test_count_ones(TestCase *tc, void *data) {
     (void)data;
     Aiequal( 0, frt_count_ones(0));
     Aiequal( 1, frt_count_ones(1));
@@ -209,8 +197,7 @@ static void test_count_ones(TestCase *tc, void *data)
     Aiequal(32, frt_count_ones(0xffffffff));
 }
 
-static void test_round2(TestCase *tc, void *data)
-{
+static void test_round2(TestCase *tc, void *data) {
     (void)data;
     Aiequal(   1, frt_round2(0));
     Aiequal(   2, frt_round2(1));
@@ -220,8 +207,7 @@ static void test_round2(TestCase *tc, void *data)
     Aiequal(2048, frt_round2(1024));
 }
 
-static void test_clean_up(TestCase *tc, void *data)
-{
+static void test_clean_up(TestCase *tc, void *data) {
     (void)data;
     int i;
     /* excercise clean_up stack by adding enough objects to overflow stack */
@@ -231,8 +217,7 @@ static void test_clean_up(TestCase *tc, void *data)
     Assert(true, "This will really be tested by valgrind");
 }
 
-TestSuite *ts_global(TestSuite *suite)
-{
+TestSuite *ts_global(TestSuite *suite) {
     suite = ADD_SUITE(suite);
 
     tst_run_test(suite, test_min_max, NULL);

data/ext/isomorfeus_ferret_ext/test_hash.c

@@ -5,22 +5,19 @@
 #include "test.h"
 #include "testhelper.h"
 
-static int *malloc_int(int val)
-{
+static int *malloc_int(int val) {
     int *i = FRT_ALLOC(int);
     *i = val;
     return i;
 }
 
-static void mark_free(void *p)
-{
+static void mark_free(void *p) {
     strcpy((char *)p, "freed");
 }
 /**
  * Basic test for string Hash. Make sure string can be retrieved
  */
-static void test_hash_str(TestCase *tc, void *data)
-{
+static void test_hash_str(TestCase *tc, void *data) {
     FrtHash *h = frt_h_new_str(NULL, &free);
     FILE *f;
     char buf[100], *t;
@@ -70,27 +67,23 @@ static void test_hash_str(TestCase *tc, void *data)
     frt_h_destroy(h);
 }
 
-typedef struct Point
-{
+typedef struct Point {
     int x;
     int y;
 } Point;
 
-static int point_eq(const void *q1, const void *q2)
-{
+static int point_eq(const void *q1, const void *q2) {
     Point *p1 = (Point *)q1;
     Point *p2 = (Point *)q2;
     return p1->x == p2->x && p1->y == p2->y;
 }
 
-static unsigned long long point_hash(const void *q)
-{
+static unsigned long point_hash(const void *q) {
     Point *p = (Point *)q;
     return p->x * p->y;
 }
 
-static Point *point_new(int x, int y)
-{
+static Point *point_new(int x, int y) {
     Point *p = FRT_ALLOC(Point);
     p->x = x;
     p->y = y;
@@ -101,8 +94,7 @@ static Point *point_new(int x, int y)
  * Basic test for standard Hash. Make sure a non-string structure can be
  * used to key the Hash
  */
-static void test_hash_point(TestCase *tc, void *data)
-{
+static void test_hash_point(TestCase *tc, void *data) {
     Point *p1 = point_new(1, 2);
     Point *p2 = point_new(2, 1);
     Point *p3 = point_new(1, 2);
@@ -145,8 +137,7 @@ static void test_hash_point(TestCase *tc, void *data)
  * integers as the key.
  */
 #define HASH_INT_TEST_SIZE 1000
-static void test_hash_int(TestCase *tc, void *data)
-{
+static void test_hash_int(TestCase *tc, void *data) {
     int i;
     FrtHash *h = frt_h_new_int(&free);
     char buf[100];
@@ -197,8 +188,7 @@ static void test_hash_int(TestCase *tc, void *data)
  * pointers as the key.
  */
 #define HASH_INT_TEST_SIZE 1000
-static void test_hash_ptr(TestCase *tc, void *data)
-{
+static void test_hash_ptr(TestCase *tc, void *data) {
     FrtHash *h = frt_h_new_ptr(&free);
     ID word1 = rb_intern("one");
     ID word2 = rb_intern("two");
@@ -245,8 +235,7 @@ static void test_hash_ptr(TestCase *tc, void *data)
  * don't take too long.
  */
 #define STRESS_SIZE 1000
-static void stress_hash(TestCase *tc, void *data)
-{
+static void stress_hash(TestCase *tc, void *data) {
     int i, j, k;
     char buf[20];
     (void)data; /* suppress unused argument warning */
@@ -295,8 +284,7 @@ static void stress_hash(TestCase *tc, void *data)
  * Test that the hash table is ok while constantly growing and shrinking in
  * size
  */
-static void test_hash_up_and_down(TestCase *tc, void *data)
-{
+static void test_hash_up_and_down(TestCase *tc, void *data) {
     int i, j;
     char buf[20];
 
@@ -337,12 +325,10 @@ static void test_hash_up_and_down(TestCase *tc, void *data)
 /**
  * Method used in frt_h_each test
  */
-static void test_each_ekv(void *key, void *value, FrtHash *h)
-{
+static void test_each_ekv(void *key, void *value, FrtHash *h) {
     if ((strlen((char *)key) % 2) == 0) {
         frt_h_del(h, key);
-    }
-    else {
+    } else {
         frt_h_del(h, value);
     }
 }
@@ -352,8 +338,7 @@ static void test_each_ekv(void *key, void *value, FrtHash *h)
  *
  * There is also a test in here of the frt_h_each method.
  */
-static void test_hash_each_and_clone(TestCase *tc, void *data)
-{
+static void test_hash_each_and_clone(TestCase *tc, void *data) {
     const char *strs[] = { "one", "two", "three", "four", "five", "six", "seven", NULL };
     const char **s = strs;
     FrtHash *h = frt_h_new_str(&free, &free);
@@ -413,15 +398,13 @@ struct StringArray {
     int size;
 };
 
-static void add_string_ekv(void *key, void *value, struct StringArray *str_arr)
-{
+static void add_string_ekv(void *key, void *value, struct StringArray *str_arr) {
     (void)key; /* suppress unused argument warning */
     str_arr->strings[str_arr->cnt] = (char *)value;
     str_arr->cnt++;
 }
 
-static struct StringArray  *frt_h_extract_strings(FrtHash *h)
-{
+static struct StringArray  *frt_h_extract_strings(FrtHash *h) {
     struct StringArray *str_arr = FRT_ALLOC(struct StringArray);
 
     str_arr->strings = FRT_ALLOC_N(char *, h->size);
@@ -437,8 +420,7 @@ static struct StringArray  *frt_h_extract_strings(FrtHash *h)
  * Again, test the frt_h_each function, this time testing the example given in the
  * documentation for the each function.
  */
-static void test_hash_extract_strings(TestCase *tc, void *data)
-{
+static void test_hash_extract_strings(TestCase *tc, void *data) {
     int i;
     struct StringArray *str_arr;
     const char *strs[] = {"one", "two", "three", "four", "five"};
@@ -469,8 +451,7 @@ static void test_hash_extract_strings(TestCase *tc, void *data)
     free(str_arr);
 }
 
-TestSuite *ts_hash(TestSuite *suite)
-{
+TestSuite *ts_hash(TestSuite *suite) {
     suite = ADD_SUITE(suite);
 
     tst_run_test(suite, test_hash_str, NULL);

data/ext/isomorfeus_ferret_ext/test_hashset.c

@@ -6,8 +6,7 @@
  * Test basic FrtHashSet functions like adding elements and testing for
  * existence.
  */
-static void test_hs(TestCase *tc, void *data)
-{
+static void test_hs(TestCase *tc, void *data) {
     char *two = frt_estrdup("two");
     FrtHashSet *hs = frt_hs_new_str(&free);
     (void)data; /* suppress unused argument warning */
@@ -58,8 +57,7 @@ static void test_hs(TestCase *tc, void *data)
     frt_hs_destroy(hs);
 }
 
-static void test_hs_ptr(TestCase *tc, void *data)
-{
+static void test_hs_ptr(TestCase *tc, void *data) {
     FrtHashSet *hs = frt_hs_new_ptr(NULL);
     ID word1 = rb_intern("one"), word2 = rb_intern("two");
     char *word_one = frt_estrdup("one");
@@ -96,8 +94,7 @@ static void test_hs_ptr(TestCase *tc, void *data)
  * Test hs_add_safe
  */
 
-static void test_hs_add_safe(TestCase *tc, void *data)
-{
+static void test_hs_add_safe(TestCase *tc, void *data) {
     char *str = frt_estrdup("one");
     FrtHashSet *hs = frt_hs_new_str(&free);
     (void)data; /* suppress unused argument warning */
@@ -129,8 +126,7 @@ static void test_hs_add_safe(TestCase *tc, void *data)
  * FrtHashSet that was merged should be destroyed including all elements that
  * weren't added to the final HashSet.
  */
-static void test_hs_merge(TestCase *tc, void *data)
-{
+static void test_hs_merge(TestCase *tc, void *data) {
     FrtHashSet *hs1 = frt_hs_new_str(&free);
     FrtHashSet *hs2 = frt_hs_new_str(&free);
     FrtHashSetEntry *hse;
@@ -163,8 +159,7 @@ static void test_hs_merge(TestCase *tc, void *data)
  * Free Mock used to test that certain elements are being freed when the
  * FrtHashSet is destroyed.
  */
-static void hs_free_mock(void *p)
-{
+static void hs_free_mock(void *p) {
     char *str = (char *) p;
     strcpy(str, "free");
 }
@@ -174,8 +169,7 @@ static void hs_free_mock(void *p)
  * FrtHashSet is destroyed, all elements have the correct free function called on
  * them
  */
-static void test_hs_free(TestCase *tc, void *data)
-{
+static void test_hs_free(TestCase *tc, void *data) {
     char str1[10], str2[10], str3[10], str4[10], str5[10];
     FrtHashSet *hs1 = frt_hs_new_str(&hs_free_mock);
     FrtHashSet *hs2 = frt_hs_new_str(&hs_free_mock);
@@ -241,8 +235,7 @@ static void test_hs_free(TestCase *tc, void *data)
  */
 #define HS_STRESS_NUM 10000 /* number of adds to the FrtHashSet */
 #define HS_STRESS_MAX 100   /* number of elements allowed in the FrtHashSet */
-static void stress_hs(TestCase *tc, void *data)
-{
+static void stress_hs(TestCase *tc, void *data) {
     int i;
     char buf[100];
     FrtHashSet *hs = frt_hs_new_str(&free);
@@ -273,8 +266,7 @@ static void stress_hs(TestCase *tc, void *data)
 /**
  * FrtHashSet Test Suite
  */
-TestSuite *ts_hashset(TestSuite *suite)
-{
+TestSuite *ts_hashset(TestSuite *suite) {
     suite = ADD_SUITE(suite);
 
     tst_run_test(suite, test_hs, NULL);

data/ext/isomorfeus_ferret_ext/test_helper.c

@@ -1,8 +1,7 @@
 #include "frt_helper.h"
 #include "test.h"
 
-static void test_hlp_string_diff(TestCase *tc, void *data)
-{
+static void test_hlp_string_diff(TestCase *tc, void *data) {
     (void)data; /* suppress unused argument warning */
 
     Aiequal(3, frt_hlp_string_diff("David", "Dave"));
@@ -12,8 +11,7 @@ static void test_hlp_string_diff(TestCase *tc, void *data)
     Aiequal(4, frt_hlp_string_diff("bookstop", "bookworm"));
 }
 
-void test_byte2float(TestCase *tc, void *data)
-{
+void test_byte2float(TestCase *tc, void *data) {
     int i;
     (void)data;
 
@@ -22,8 +20,7 @@ void test_byte2float(TestCase *tc, void *data)
     }
 }
 
-void test_int2float(TestCase *tc, void *data)
-{
+void test_int2float(TestCase *tc, void *data) {
     int i;
     (void)data;
 
@@ -35,8 +32,7 @@ void test_int2float(TestCase *tc, void *data)
     }
 }
 
-TestSuite *ts_helper(TestSuite *suite)
-{
+TestSuite *ts_helper(TestSuite *suite) {
     suite = ADD_SUITE(suite);
 
     tst_run_test(suite, test_hlp_string_diff, NULL);