isomorfeus-ferret 0.17.2 → 0.17.4

data/ext/isomorfeus_ferret_ext/frt_term_vectors.c

@@ -10,8 +10,7 @@
  *
  ****************************************************************************/
 
-void frt_tv_destroy(FrtTermVector *tv)
-{
+void frt_tv_destroy(FrtTermVector *tv) {
     int i = tv->term_cnt;
     while (i > 0) {
         i--;
@@ -23,8 +22,7 @@ void frt_tv_destroy(FrtTermVector *tv)
     free(tv);
 }
 
-int frt_tv_scan_to_term_index(FrtTermVector *tv, const char *term)
-{
+int frt_tv_scan_to_term_index(FrtTermVector *tv, const char *term) {
     int lo = 0;                 /* search starts array */
     int hi = tv->term_cnt - 1;  /* for 1st element < n, return its index */
     int mid;
@@ -37,36 +35,30 @@ int frt_tv_scan_to_term_index(FrtTermVector *tv, const char *term)
         cmp = strcmp(term, mid_term);
         if (cmp < 0) {
             hi = mid - 1;
-        }
-        else if (cmp > 0) {
+        } else if (cmp > 0) {
             lo = mid + 1;
-        }
-        else {                  /* found a match */
+        } else {                  /* found a match */
             return mid;
         }
     }
     return lo;
 }
 
-int frt_tv_get_term_index(FrtTermVector *tv, const char *term)
-{
+int frt_tv_get_term_index(FrtTermVector *tv, const char *term) {
     int index = frt_tv_scan_to_term_index(tv, term);
     if (index < tv->term_cnt && (0 == strcmp(term, tv->terms[index].text))) {
         /* found term */
         return index;
-    }
-    else {
+    } else {
         return -1;
     }
 }
 
-FrtTVTerm *frt_tv_get_tv_term(FrtTermVector *tv, const char *term)
-{
+FrtTVTerm *frt_tv_get_tv_term(FrtTermVector *tv, const char *term) {
     int index = frt_tv_get_term_index(tv, term);
     if (index >= 0) {
         return &(tv->terms[index]);
-    }
-    else {
+    } else {
         return NULL;
     }
 }

data/ext/isomorfeus_ferret_ext/frt_win32.h

@@ -4,20 +4,17 @@
 #include "frt_global.h"
 #include <io.h>
 
-struct dirent
-{
+struct dirent {
     char *d_name;
 };
 
-typedef struct DIR
-{
+typedef struct DIR {
     struct _finddata_t find_data;
     struct dirent de;
     long handle;
 } DIR;
 
-DIR *opendir(const char *dirname)
-{
+DIR *opendir(const char *dirname) {
     DIR *d = FRT_ALLOC_AND_ZERO(DIR);
     char dirname_buf[FRT_MAX_FILE_PATH];
     long ff_res;
@@ -33,8 +30,7 @@ DIR *opendir(const char *dirname)
     return d;
 }
 
-struct dirent *readdir(DIR *d)
-{
+struct dirent *readdir(DIR *d) {
     /* _findfirst already returned so do _findnext */
     if (d->de.d_name != NULL) {
         if (_findnext(d->handle, &d->find_data) < 0) {
@@ -45,8 +41,7 @@ struct dirent *readdir(DIR *d)
     return &d->de;
 }
 
-void closedir(DIR *d)
-{
+void closedir(DIR *d) {
     _findclose(d->handle);
     free(d);
 }

data/ext/isomorfeus_ferret_ext/isomorfeus_ferret.c

@@ -5,6 +5,8 @@
 #include "frt_hashset.h"
 #include "frt_threading.h"
 
+const char *segm_idx_name = "segmented_index";
+
 /* IDs */
 ID id_new;
 ID id_call;
@@ -32,21 +34,21 @@ VALUE sym_each;
 /* Modules */
 VALUE mIsomorfeus;
 VALUE mFerret;
-VALUE mStore;
-VALUE mStringHelper;
-VALUE mSpans;
 
 /* Classes */
-VALUE cTerm;
+static VALUE cTerm;
 VALUE cFileNotFoundError;
 VALUE cParseError;
 VALUE cStateError;
 
-void Init_Benchmark(void);
-void Init_Test(void);
+extern void Init_Benchmark(void);
+extern void Init_Test(void);
 
 unsigned long value_hash(const void *key) {
-    return (unsigned long)key;
+    /* double cast to prevent compiler warning:
+     * - first cast: pointer to number of same size
+     * - second cast: number to smaller number */
+    return (unsigned long)(uintptr_t)key;
 }
 
 int value_eq(const void *key1, const void *key2) {
@@ -119,15 +121,14 @@ ID frb_field(VALUE rfield) {
  * Jeremie 'ahFeel' BORDIER
  * ahFeel@rift.Fr
  */
-char *json_concat_string(char *s, char *field) {
+char *json_concat_string(char *s, const char *field) {
     *(s++) = '"';
 	while (*field) {
 		if (*field == '"') {
             *(s++) = '\'';
             *(s++) = *(field++);
             *(s++) = '\'';
-        }
-        else {
+        } else {
             *(s++) = *(field++);
         }
     }
@@ -308,6 +309,6 @@ void Init_isomorfeus_ferret_ext(void) {
     rb_define_const(mFerret, "FIX_INT_MAX", INT2FIX(INT_MAX >> 1));
 }
 
-extern void frb_raise(int excode, const char *msg) {
+void frb_raise(int excode, const char *msg) {
     rb_raise(frb_get_error(ERROR_TYPES[excode]), "%s", msg);
 }

data/ext/isomorfeus_ferret_ext/isomorfeus_ferret.h

@@ -1,10 +1,13 @@
-#ifndef __FERRET_H_
-#define __FERRET_H_
+#ifndef __ISOMORFEUS_FERRET_H_
+#define __ISOMORFEUS_FERRET_H_
+
 #include "frt_global.h"
 #include "frt_hashset.h"
 #include "frt_document.h"
 #include <ruby.h>
 
+extern const char *segm_idx_name;
+
 /* IDs */
 extern ID id_new;
 extern ID id_call;
@@ -29,24 +32,19 @@ extern VALUE sym_dir;
 /* Modules */
 extern VALUE mFerret;
 extern VALUE mIndex;
-extern VALUE mSearch;
-extern VALUE mStore;
-extern VALUE mStringHelper;
-extern VALUE mSpans;
 
 /* Classes */
 extern VALUE cDirectory;
 extern VALUE cFileNotFoundError;
 extern VALUE cLockError;
-extern VALUE cTerm;
 
 /* Ferret Inits */
-extern void Init_Utils(void);
 extern void Init_Analysis(void);
-extern void Init_Store(void);
 extern void Init_Index(void);
-extern void Init_Search(void);
 extern void Init_QueryParser(void);
+extern void Init_Search(void);
+extern void Init_Store(void);
+extern void Init_Utils(void);
 
 extern void frb_raise(int excode, const char *msg);
 extern void frb_create_dir(VALUE rpath);
@@ -54,11 +52,11 @@ extern VALUE frb_hs_to_rb_ary(FrtHashSet *hs);
 extern void *frb_rb_data_ptr(VALUE val);
 extern ID frb_field(VALUE rfield);
 extern VALUE frb_get_term(ID field, const char *term);
-extern char *json_concat_string(char *s, char *field);
+extern char *json_concat_string(char *s, const char *field);
 extern char *rs2s(VALUE rstr);
 extern char *rstrdup(VALUE rstr);
 
-#endif
-
 #define frb_mark_cclass(klass) rb_ivar_set(klass, id_cclass, Qtrue)
 #define frb_is_cclass(obj) (rb_ivar_defined(CLASS_OF(obj), id_cclass))
+
+#endif