isomorfeus-ferret 0.13.6 → 0.13.9

data/ext/isomorfeus_ferret_ext/frt_compound_io.c

@@ -1,7 +1,7 @@
 #include "frt_index.h"
 #include "frt_array.h"
 
-extern void frt_store_destroy(FrtStore *store);
+extern void frt_store_close(FrtStore *store);
 extern FrtInStream *frt_is_new();
 extern FrtStore *frt_store_new();
 
@@ -16,45 +16,37 @@ typedef struct FileEntry {
     off_t length;
 } FileEntry;
 
-static void cmpd_touch(FrtStore *store, const char *file_name)
-{
+static void cmpd_touch(FrtStore *store, const char *file_name) {
     store->dir.cmpd->store->touch(store->dir.cmpd->store, file_name);
 }
 
-static int cmpd_exists(FrtStore *store, const char *file_name)
-{
+static int cmpd_exists(FrtStore *store, const char *file_name) {
     if (frt_h_get(store->dir.cmpd->entries, file_name) != NULL) {
         return true;
-    }
-    else {
+    } else {
         return false;
     }
 }
 
-static int cmpd_remove(FrtStore *store, const char *file_name)
-{
+static int cmpd_remove(FrtStore *store, const char *file_name) {
     (void)store;
     (void)file_name;
     FRT_RAISE(FRT_UNSUPPORTED_ERROR, "%s", FRT_UNSUPPORTED_ERROR_MSG);
     return 0;
 }
 
-static void cmpd_rename(FrtStore *store, const char *from, const char *to)
-{
+static void cmpd_rename(FrtStore *store, const char *from, const char *to) {
     (void)store;
     (void)from;
     (void)to;
     FRT_RAISE(FRT_UNSUPPORTED_ERROR, "%s", FRT_UNSUPPORTED_ERROR_MSG);
 }
 
-static int cmpd_count(FrtStore *store)
-{
+static int cmpd_count(FrtStore *store) {
     return store->dir.cmpd->entries->size;
 }
 
-static void cmpd_each(FrtStore *store,
-                     void (*func)(const char *fname, void *arg), void *arg)
-{
+static void cmpd_each(FrtStore *store, void (*func)(const char *fname, void *arg), void *arg) {
     FrtHash *ht = store->dir.cmpd->entries;
     int i;
     for (i = 0; i <= ht->mask; i++) {
@@ -65,15 +57,12 @@ static void cmpd_each(FrtStore *store,
     }
 }
 
-
-static void cmpd_clear(FrtStore *store)
-{
+static void cmpd_clear(FrtStore *store) {
     (void)store;
     FRT_RAISE(FRT_UNSUPPORTED_ERROR, "%s", FRT_UNSUPPORTED_ERROR_MSG);
 }
 
-static void cmpd_close_i(FrtStore *store)
-{
+static void cmpd_close_i(FrtStore *store) {
     FrtCompoundStore *cmpd = store->dir.cmpd;
     if (cmpd->stream == NULL) {
         FRT_RAISE(FRT_IO_ERROR, "Tried to close already closed compound store");
@@ -83,42 +72,37 @@ static void cmpd_close_i(FrtStore *store)
 
     frt_is_close(cmpd->stream);
     cmpd->stream = NULL;
+    frt_store_close(cmpd->store);
     free(store->dir.cmpd);
-    frt_store_destroy(store);
 }
 
-static off_t cmpd_length(FrtStore *store, const char *file_name)
-{
+static off_t cmpd_length(FrtStore *store, const char *file_name) {
     FileEntry *fe = (FileEntry *)frt_h_get(store->dir.cmpd->entries, file_name);
     if (fe != NULL) {
         return fe->length;
-    }
-    else {
+    } else {
         return 0;
     }
 }
 
-static void cmpdi_seek_i(FrtInStream *is, off_t pos)
-{
+static void cmpdi_seek_i(FrtInStream *is, off_t pos) {
     (void)is;
     (void)pos;
 }
 
-static void cmpdi_close_i(FrtInStream *is)
-{
+static void cmpdi_close_i(FrtInStream *is) {
+    frt_is_close(is->d.cis->sub);
     free(is->d.cis);
 }
 
-static off_t cmpdi_length_i(FrtInStream *is)
-{
+static off_t cmpdi_length_i(FrtInStream *is) {
     return (is->d.cis->length);
 }
 
 /*
  * raises: FRT_EOF_ERROR
  */
-static void cmpdi_read_i(FrtInStream *is, frt_uchar *b, int len)
-{
+static void cmpdi_read_i(FrtInStream *is, frt_uchar *b, int len) {
     FrtCompoundInStream *cis = is->d.cis;
     off_t start = frt_is_pos(is);
 
@@ -139,12 +123,12 @@ static const struct FrtInStreamMethods CMPD_IN_STREAM_METHODS = {
     cmpdi_close_i
 };
 
-static FrtInStream *cmpd_create_input(FrtInStream *sub_is, off_t offset, off_t length)
-{
+static FrtInStream *cmpd_create_input(FrtInStream *sub_is, off_t offset, off_t length) {
     FrtInStream *is = frt_is_new();
     FrtCompoundInStream *cis = FRT_ALLOC(FrtCompoundInStream);
 
     cis->sub = sub_is;
+    FRT_REF(sub_is);
     cis->offset = offset;
     cis->length = length;
     is->d.cis = cis;
@@ -153,8 +137,7 @@ static FrtInStream *cmpd_create_input(FrtInStream *sub_is, off_t offset, off_t l
     return is;
 }
 
-static FrtInStream *cmpd_open_input(FrtStore *store, const char *file_name)
-{
+static FrtInStream *cmpd_open_input(FrtStore *store, const char *file_name) {
     FileEntry *entry;
     FrtCompoundStore *cmpd = store->dir.cmpd;
     FrtInStream *is;
@@ -178,30 +161,26 @@ static FrtInStream *cmpd_open_input(FrtStore *store, const char *file_name)
     return is;
 }
 
-static FrtOutStream *cmpd_new_output(FrtStore *store, const char *file_name)
-{
+static FrtOutStream *cmpd_new_output(FrtStore *store, const char *file_name) {
     (void)store;
     (void)file_name;
     FRT_RAISE(FRT_UNSUPPORTED_ERROR, "%s", FRT_UNSUPPORTED_ERROR_MSG);
     return NULL;
 }
 
-static FrtLock *cmpd_open_lock_i(FrtStore *store, const char *lock_name)
-{
+static FrtLock *cmpd_open_lock_i(FrtStore *store, const char *lock_name) {
     (void)store;
     (void)lock_name;
     FRT_RAISE(FRT_UNSUPPORTED_ERROR, "%s", FRT_UNSUPPORTED_ERROR_MSG);
     return NULL;
 }
 
-static void cmpd_close_lock_i(FrtLock *lock)
-{
+static void cmpd_close_lock_i(FrtLock *lock) {
     (void)lock;
     FRT_RAISE(FRT_UNSUPPORTED_ERROR, "%s", FRT_UNSUPPORTED_ERROR_MSG);
 }
 
-FrtStore *frt_open_cmpd_store(FrtStore *store, const char *name)
-{
+FrtStore *frt_open_cmpd_store(FrtStore *store, const char *name) {
     int count, i;
     off_t offset;
     char *fname;
@@ -214,6 +193,7 @@ FrtStore *frt_open_cmpd_store(FrtStore *store, const char *name)
         cmpd = FRT_ALLOC_AND_ZERO(FrtCompoundStore);
 
         cmpd->store       = store;
+        FRT_REF(store);
         cmpd->name        = name;
         cmpd->entries     = frt_h_new_str(&free, &free);
         is = cmpd->stream = store->open_input(store, cmpd->name);
@@ -235,6 +215,7 @@ FrtStore *frt_open_cmpd_store(FrtStore *store, const char *name)
             frt_h_set(cmpd->entries, fname, entry);
         }
     FRT_XCATCHALL
+        frt_store_close(store);
         if (is) frt_is_close(is);
         if (cmpd->entries) frt_h_destroy(cmpd->entries);
         free(cmpd);
@@ -270,18 +251,17 @@ FrtStore *frt_open_cmpd_store(FrtStore *store, const char *name)
  *
  ****************************************************************************/
 
-FrtCompoundWriter *frt_open_cw(FrtStore *store, char *name)
-{
+FrtCompoundWriter *frt_open_cw(FrtStore *store, char *name) {
     FrtCompoundWriter *cw = FRT_ALLOC(FrtCompoundWriter);
     cw->store = store;
+    FRT_REF(store);
     cw->name = name;
     cw->ids = frt_hs_new_str(&free);
     cw->file_entries = frt_ary_new_type_capa(FrtCWFileEntry, FRT_CW_INIT_CAPA);
     return cw;
 }
 
-void frt_cw_add_file(FrtCompoundWriter *cw, char *id)
-{
+void frt_cw_add_file(FrtCompoundWriter *cw, char *id) {
     id = frt_estrdup(id);
     if (frt_hs_add(cw->ids, id) != FRT_HASH_KEY_DOES_NOT_EXIST) {
         FRT_RAISE(FRT_IO_ERROR, "Tried to add file \"%s\" which has already been "
@@ -292,8 +272,7 @@ void frt_cw_add_file(FrtCompoundWriter *cw, char *id)
     frt_ary_last(cw->file_entries).name = id;
 }
 
-static void cw_copy_file(FrtCompoundWriter *cw, FrtCWFileEntry *src, FrtOutStream *os)
-{
+static void cw_copy_file(FrtCompoundWriter *cw, FrtCWFileEntry *src, FrtOutStream *os) {
     off_t start_ptr = frt_os_pos(os);
     off_t end_ptr;
     off_t remainder, length, len;
@@ -329,8 +308,7 @@ static void cw_copy_file(FrtCompoundWriter *cw, FrtCWFileEntry *src, FrtOutStrea
     frt_is_close(is);
 }
 
-void frt_cw_close(FrtCompoundWriter *cw, FrtDeleter *dlr)
-{
+void frt_cw_close(FrtCompoundWriter *cw, FrtDeleter *dlr) {
     FrtOutStream *os = NULL;
     int i;
 
@@ -366,12 +344,9 @@ void frt_cw_close(FrtCompoundWriter *cw, FrtDeleter *dlr)
         frt_os_seek(os, cw->file_entries[i].dir_offset);
         frt_os_write_u64(os, cw->file_entries[i].data_offset);
     }
-
-    if (os) {
-        frt_os_close(os);
-    }
-
+    frt_os_close(os);
     frt_hs_destroy(cw->ids);
     frt_ary_free(cw->file_entries);
+    frt_store_close(cw->store);
     free(cw);
 }

data/ext/isomorfeus_ferret_ext/frt_except.c

@@ -33,6 +33,7 @@ static frt_thread_once_t exception_stack_key_once = FRT_THREAD_ONCE_INIT;
 
 static void exception_stack_alloc(void) {
     frt_thread_key_create(&exception_stack_key, NULL);
+    frt_thread_setspecific(exception_stack_key, NULL);
 }
 
 void frt_xpush_context(frt_xcontext_t *context) {

data/ext/isomorfeus_ferret_ext/frt_field_index.c

@@ -1,7 +1,7 @@
 #include <string.h>
 #include "frt_field_index.h"
 
-#undef close
+// #undef close
 
 /***************************************************************************
  *

data/ext/isomorfeus_ferret_ext/frt_filter.c

@@ -14,9 +14,7 @@ void frt_filt_destroy_i(FrtFilter *filt) {
 }
 
 void frt_filt_deref(FrtFilter *filt) {
-    if (--(filt->ref_cnt) == 0) {
-        filt->destroy_i(filt);
-    }
+    if (FRT_DEREF(filt) == 0) filt->destroy_i(filt);
 }
 
 FrtBitVector *frt_filt_get_bv(FrtFilter *filt, FrtIndexReader *ir) {
@@ -97,7 +95,7 @@ static FrtBitVector *qfilt_get_bv_i(FrtFilter *filt, FrtIndexReader *ir) {
         scorer->destroy(scorer);
     }
     weight->destroy(weight);
-    free(sea);
+    frt_searcher_close(sea);
     return bv;
 }
 

data/ext/isomorfeus_ferret_ext/frt_fs_store.c

@@ -223,7 +223,6 @@ static void fs_destroy(FrtStore *store)
         FRT_HANDLED();
     FRT_XENDTRY
     free(store->dir.path);
-    frt_store_destroy(store);
 }
 
 static off_t fs_length(FrtStore *store, const char *filename)
@@ -286,7 +285,7 @@ static FrtOutStream *fs_new_output(FrtStore *store, const char *filename)
 
 static void fsi_read_i(FrtInStream *is, frt_uchar *path, int len)
 {
-    int fd = is->file.fd;
+    int fd = is->f->file.fd;
     off_t pos = frt_is_pos(is);
     if (pos != lseek(fd, 0, SEEK_CUR)) {
         lseek(fd, pos, SEEK_SET);
@@ -302,7 +301,7 @@ static void fsi_read_i(FrtInStream *is, frt_uchar *path, int len)
 
 static void fsi_seek_i(FrtInStream *is, off_t pos)
 {
-    if (lseek(is->file.fd, pos, SEEK_SET) < 0) {
+    if (lseek(is->f->file.fd, pos, SEEK_SET) < 0) {
         FRT_RAISE(FRT_IO_ERROR, "seeking pos %"FRT_OFF_T_PFX"d: <%s>",
               pos, strerror(errno));
     }
@@ -310,16 +309,16 @@ static void fsi_seek_i(FrtInStream *is, off_t pos)
 
 static void fsi_close_i(FrtInStream *is)
 {
-    if (close(is->file.fd)) {
+    if (close(is->f->file.fd)) {
         FRT_RAISE(FRT_IO_ERROR, "%s", strerror(errno));
     }
-    free(is->d.path);
+    if (is->d.path) free(is->d.path);
 }
 
 static off_t fsi_length_i(FrtInStream *is)
 {
     struct stat stt;
-    if (fstat(is->file.fd, &stt)) {
+    if (fstat(is->f->file.fd, &stt)) {
         FRT_RAISE(FRT_IO_ERROR, "fstat failed: <%s>", strerror(errno));
     }
     return stt.st_size;
@@ -343,7 +342,8 @@ static FrtInStream *fs_open_input(FrtStore *store, const char *filename)
               path, strerror(errno));
     }
     is = frt_is_new();
-    is->file.fd = fd;
+    is->f->file.fd = fd;
+    is->f->ref_cnt = 1;
     is->d.path = frt_estrdup(path);
     is->m = &FS_IN_STREAM_METHODS;
     return is;
@@ -400,6 +400,7 @@ static FrtLock *fs_open_lock_i(FrtStore *store, const char *lockname)
     snprintf(lname, 100, "%s%s.lck", FRT_LOCK_PREFIX, lockname);
     lock->name = frt_estrdup(join_path(path, store->dir.path, lname));
     lock->store = store;
+    FRT_REF(store);
     lock->obtain = &fs_lock_obtain;
     lock->release = &fs_lock_release;
     lock->is_locked = &fs_lock_is_locked;
@@ -409,6 +410,7 @@ static FrtLock *fs_open_lock_i(FrtStore *store, const char *lockname)
 
 static void fs_close_lock_i(FrtLock *lock)
 {
+    frt_store_close(lock->store);
     remove(lock->name);
     free(lock->name);
     free(lock);
@@ -486,11 +488,8 @@ FrtStore *frt_open_fs_store(const char *pathname)
     frt_mutex_lock(&stores_mutex);
     store = (FrtStore *)frt_h_get(stores, pathname);
     if (store) {
-        frt_mutex_lock(&store->mutex);
-        store->ref_cnt++;
-        frt_mutex_unlock(&store->mutex);
-    }
-    else {
+        FRT_REF(store);
+    } else {
         store = fs_store_new(pathname);
         frt_h_set(stores, store->dir.path, store);
     }

data/ext/isomorfeus_ferret_ext/frt_global.c

@@ -116,13 +116,15 @@ char *frt_estrdup(const char *s) {
 char *frt_dbl_to_s(char *buf, double num) {
     char *p, *e;
 
-#ifdef FRT_IS_C99
     if (isinf(num)) {
-        return frt_estrdup(num < 0 ? "-Infinity" : "Infinity");
+        if (num < 0) {
+            return strcpy(buf, "-Infinity");
+        } else {
+            return strcpy(buf, "Infinity");
+        }
     } else if (isnan(num)) {
-        return frt_estrdup("NaN");
+        return strcpy(buf, "NaN");
     }
-#endif
 
     sprintf(buf, FRT_DBL2S, num);
     if (!(e = strchr(buf, 'e'))) {

data/ext/isomorfeus_ferret_ext/frt_global.h

@@ -13,7 +13,7 @@
 
 #define FRT_MAX_WORD_SIZE 255
 #define FRT_MAX_FILE_PATH 1024
-#define FRT_BUFFER_SIZE 1024
+#define FRT_BUFFER_SIZE 16384
 
 typedef enum {
     FRT_COMPRESSION_NONE = 0,
@@ -49,7 +49,7 @@ typedef void (*frt_free_ft)(void *key);
 #define FRT_ALLOC_AND_ZERO_N(type,n) (type*)frt_ecalloc(sizeof(type)*(n))
 
 #define FRT_REF(a) (a)->ref_cnt++
-#define FRT_DEREF(a) (a)->ref_cnt--
+#define FRT_DEREF(a) --((a)->ref_cnt)
 
 #define FRT_NEXT_NUM(index, size) (((index) + 1) % (size))
 #define FRT_PREV_NUM(index, size) (((index) + (size) - 1) % (size))

data/ext/isomorfeus_ferret_ext/frt_hash.c

@@ -19,9 +19,9 @@ static const char *dummy_int_key = "i";
 static FrtHash *free_hts[MAX_FREE_HASH_TABLES];
 static int num_free_hts = 0;
 
-unsigned long long frt_str_hash(const char *const str)
+unsigned long frt_str_hash(const char *const str)
 {
-    register unsigned long long h = 0;
+    register unsigned long h = 0;
     register unsigned char *p = (unsigned char *)str;
 
     for (; *p; p++) {
@@ -30,9 +30,9 @@ unsigned long long frt_str_hash(const char *const str)
     return h;
 }
 
-unsigned long long frt_ptr_hash(const void *const ptr)
+unsigned long frt_ptr_hash(const void *const ptr)
 {
-    return (unsigned long long)ptr;
+    return (unsigned long)ptr;
 }
 
 int frt_ptr_eq(const void *q1, const void *q2)
@@ -55,7 +55,7 @@ typedef FrtHashEntry *(*lookup_ft)(struct FrtHash *self, register const void *ke
  * @param the hashkey we are looking for
  */
 static FrtHashEntry  *frt_h_resize_lookup(FrtHash *self,
-                                         register const unsigned long long hash)
+                                         register const unsigned long hash)
 {
     register unsigned long perturb;
     register int mask = self->mask;
@@ -78,9 +78,8 @@ static FrtHashEntry  *frt_h_resize_lookup(FrtHash *self,
     }
 }
 
-static FrtHashEntry  *frt_h_lookup_ptr(FrtHash *self, const void *key)
-{
-    register const unsigned long long hash = (unsigned long long)key;
+static FrtHashEntry *frt_h_lookup_ptr(FrtHash *self, const void *key) {
+    register const unsigned long hash = (unsigned long)key;
     register unsigned long perturb;
     register int mask = self->mask;
     register FrtHashEntry *he0 = self->table;
@@ -88,36 +87,34 @@ static FrtHashEntry  *frt_h_lookup_ptr(FrtHash *self, const void *key)
     register FrtHashEntry *he = &he0[i];
     register FrtHashEntry *freeslot = NULL;
 
-    if (he->key == NULL || he->hash == hash) {
+    if (he->key == NULL) {
         he->hash = hash;
         return he;
     }
-    if (he->key == dummy_key) {
-        freeslot = he;
-    }
+
+    if (he->hash == hash) return he;
+
+    if (he->key == dummy_key) freeslot = he;
 
     for (perturb = hash;; perturb >>= PERTURB_SHIFT) {
         i = (i << 2) + i + perturb + 1;
         he = &he0[i & mask];
+
         if (he->key == NULL) {
-            if (freeslot != NULL) {
-                he = freeslot;
-            }
+            if (freeslot != NULL) he = freeslot;
             he->hash = hash;
             return he;
         }
-        if (he->hash == hash) {
-            return he;
-        }
-        if (he->key == dummy_key && freeslot == NULL) {
-            freeslot = he;
-        }
+
+        if (he->hash == hash) return he;
+
+        if (he->key == dummy_key && freeslot == NULL) freeslot = he;
     }
+    return he;
 }
 
-FrtHashEntry *frt_h_lookup(FrtHash *self, register const void *key)
-{
-    register const unsigned long long hash = self->hash_i(key);
+FrtHashEntry *frt_h_lookup(FrtHash *self, register const void *key) {
+    register const unsigned long hash = self->hash_i(key);
     register unsigned long perturb;
     register int mask = self->mask;
     register FrtHashEntry *he0 = self->table;
@@ -185,7 +182,7 @@ FrtHash *frt_h_new_str(frt_free_ft free_key, frt_free_ft free_value)
 
 FrtHash *frt_h_new_int(frt_free_ft free_value)
 {
-    FrtHash *self     = frt_h_new_str(NULL, free_value);
+    FrtHash *self  = frt_h_new_str(NULL, free_value);
 
     self->lookup_i = &frt_h_lookup_ptr;
     self->eq_i     = NULL;
@@ -196,7 +193,7 @@ FrtHash *frt_h_new_int(frt_free_ft free_value)
 
 FrtHash *frt_h_new(frt_hash_ft hash, frt_eq_ft eq, frt_free_ft free_key, frt_free_ft free_value)
 {
-    FrtHash *self     = frt_h_new_str(free_key, free_value);
+    FrtHash *self  = frt_h_new_str(free_key, free_value);
 
     self->lookup_i = &frt_h_lookup;
     self->eq_i     = eq;
@@ -228,27 +225,24 @@ void frt_h_clear(FrtHash *self)
     self->fill = 0;
 }
 
-void frt_h_destroy(FrtHash *self)
-{
-    if (--(self->ref_cnt) <= 0) {
-        frt_h_clear(self);
+void frt_h_destroy(FrtHash *hash) {
+    if (FRT_DEREF(hash) == 0) {
+        frt_h_clear(hash);
 
         /* if a new table was created, be sure to free it */
-        if (self->table != self->smalltable) {
-            free(self->table);
+        if (hash->table != hash->smalltable) {
+            free(hash->table);
         }
 
         if (num_free_hts < MAX_FREE_HASH_TABLES) {
-            free_hts[num_free_hts++] = self;
-        }
-        else {
-            free(self);
+            free_hts[num_free_hts++] = hash;
+        } else {
+            free(hash);
         }
     }
 }
 
-void *frt_h_get(FrtHash *self, const void *key)
-{
+void *frt_h_get(FrtHash *self, const void *key) {
     /* Note: lookup_i will never return NULL. */
     return self->lookup_i(self, key)->value;
 }
@@ -270,8 +264,7 @@ int frt_h_del(FrtHash *self, const void *key)
     }
 }
 
-void *frt_h_rem(FrtHash *self, const void *key, bool destroy_key)
-{
+void *frt_h_rem(FrtHash *self, const void *key, bool destroy_key) {
     void *val;
     FrtHashEntry *he = self->lookup_i(self, key);
 
@@ -285,8 +278,7 @@ void *frt_h_rem(FrtHash *self, const void *key, bool destroy_key)
         he->value = NULL;
         self->size--;
         return val;
-    }
-    else {
+    } else {
         return NULL;
     }
 }
@@ -405,23 +397,23 @@ FrtHashKeyStatus frt_h_has_key(FrtHash *self, const void *key)
     return FRT_HASH_KEY_EQUAL;
 }
 
-void *frt_h_get_int(FrtHash *self, const unsigned long long key)
+void *frt_h_get_int(FrtHash *self, const unsigned long key)
 {
     return frt_h_get(self, (const void *)key);
 }
 
-int frt_h_del_int(FrtHash *self, const unsigned long long key)
+int frt_h_del_int(FrtHash *self, const unsigned long key)
 {
     return frt_h_del(self, (const void *)key);
 }
 
-void *frt_h_rem_int(FrtHash *self, const unsigned long long key)
+void *frt_h_rem_int(FrtHash *self, const unsigned long key)
 {
     return frt_h_rem(self, (const void *)key, false);
 }
 
 FrtHashKeyStatus frt_h_set_int(FrtHash *self,
-                               const unsigned long long key,
+                               const unsigned long key,
                                void *value)
 {
     FrtHashKeyStatus ret_val = FRT_HASH_KEY_DOES_NOT_EXIST;
@@ -439,7 +431,7 @@ FrtHashKeyStatus frt_h_set_int(FrtHash *self,
     return ret_val;
 }
 
-int frt_h_set_safe_int(FrtHash *self, const unsigned long long key, void *value)
+int frt_h_set_safe_int(FrtHash *self, const unsigned long key, void *value)
 {
     FrtHashEntry *he;
     if (frt_h_set_ext(self, (const void *)key, &he)) {
@@ -450,7 +442,7 @@ int frt_h_set_safe_int(FrtHash *self, const unsigned long long key, void *value)
     return false;
 }
 
-int frt_h_has_key_int(FrtHash *self, const unsigned long long key)
+int frt_h_has_key_int(FrtHash *self, const unsigned long key)
 {
     return frt_h_has_key(self, (const void *)key);
 }