isomorfeus-ferret 0.12.7 → 0.13.0

data/ext/isomorfeus_ferret_ext/frt_q_term.c

@@ -2,6 +2,9 @@
 #include <string.h>
 #include "frt_search.h"
 
+#undef close
+#undef read
+
 #define TQ(query) ((FrtTermQuery *)(query))
 #define TSc(scorer) ((TermScorer *)(scorer))
 
@@ -14,30 +17,27 @@
 #define SCORE_CACHE_SIZE 32
 #define TDE_READ_SIZE 32
 
-typedef struct TermScorer
-{
-    FrtScorer          super;
-    int             docs[TDE_READ_SIZE];
-    int             freqs[TDE_READ_SIZE];
-    int             pointer;
-    int             pointer_max;
-    float           score_cache[SCORE_CACHE_SIZE];
-    FrtWeight         *weight;
-    FrtTermDocEnum    *tde;
-    frt_uchar          *norms;
-    float           weight_value;
+typedef struct TermScorer {
+    FrtScorer      super;
+    int            docs[TDE_READ_SIZE];
+    int            freqs[TDE_READ_SIZE];
+    int            pointer;
+    int            pointer_max;
+    float          score_cache[SCORE_CACHE_SIZE];
+    FrtWeight      *weight;
+    FrtTermDocEnum *tde;
+    frt_uchar      *norms;
+    float          weight_value;
 } TermScorer;
 
-static float tsc_score(FrtScorer *self)
-{
+static float tsc_score(FrtScorer *self) {
     TermScorer *ts = TSc(self);
     int freq = ts->freqs[ts->pointer];
     float score;
     /* compute tf(f)*weight */
     if (freq < SCORE_CACHE_SIZE) {    /* check cache */
         score = ts->score_cache[freq];  /* cache hit */
-    }
-    else {
+    } else {
         /* cache miss */
         score = frt_sim_tf(self->similarity, (float)freq) * ts->weight_value;
     }
@@ -46,19 +46,16 @@ static float tsc_score(FrtScorer *self)
     return score;
 }
 
-static bool tsc_next(FrtScorer *self)
-{
+static bool tsc_next(FrtScorer *self) {
     TermScorer *ts = TSc(self);
 
     ts->pointer++;
     if (ts->pointer >= ts->pointer_max) {
         /* refill buffer */
-        ts->pointer_max = ts->tde->read(ts->tde, ts->docs, ts->freqs,
-                                        TDE_READ_SIZE);
+        ts->pointer_max = ts->tde->read(ts->tde, ts->docs, ts->freqs, TDE_READ_SIZE);
         if (ts->pointer_max != 0) {
             ts->pointer = 0;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -66,8 +63,7 @@ static bool tsc_next(FrtScorer *self)
     return true;
 }
 
-static bool tsc_skip_to(FrtScorer *self, int doc_num)
-{
+static bool tsc_skip_to(FrtScorer *self, int doc_num) {
     TermScorer *ts = TSc(self);
     FrtTermDocEnum *tde = ts->tde;
 
@@ -86,14 +82,12 @@ static bool tsc_skip_to(FrtScorer *self, int doc_num)
         ts->docs[0] = self->doc = tde->doc_num(tde);
         ts->freqs[0] = tde->freq(tde);
         return true;
-    }
-    else {
+    } else {
         return false;
     }
 }
 
-static FrtExplanation *tsc_explain(FrtScorer *self, int doc_num)
-{
+static FrtExplanation *tsc_explain(FrtScorer *self, int doc_num) {
     TermScorer *ts = TSc(self);
     FrtQuery *query = ts->weight->get_query(ts->weight);
     int tf = 0;
@@ -107,14 +101,12 @@ static FrtExplanation *tsc_explain(FrtScorer *self, int doc_num)
                     rb_id2name(TQ(query)->field), TQ(query)->term, tf);
 }
 
-static void tsc_destroy(FrtScorer *self)
-{
+static void tsc_destroy(FrtScorer *self) {
     TSc(self)->tde->close(TSc(self)->tde);
     frt_scorer_destroy_i(self);
 }
 
-static FrtScorer *tsc_new(FrtWeight *weight, FrtTermDocEnum *tde, frt_uchar *norms)
-{
+static FrtScorer *tsc_new(FrtWeight *weight, FrtTermDocEnum *tde, frt_uchar *norms) {
     int i;
     FrtScorer *self            = frt_scorer_new(TermScorer, weight->similarity);
     TSc(self)->weight       = weight;
@@ -141,8 +133,7 @@ static FrtScorer *tsc_new(FrtWeight *weight, FrtTermDocEnum *tde, frt_uchar *nor
  *
  ***************************************************************************/
 
-static FrtScorer *tw_scorer(FrtWeight *self, FrtIndexReader *ir)
-{
+static FrtScorer *tw_scorer(FrtWeight *self, FrtIndexReader *ir) {
     FrtTermQuery *tq = TQ(self->query);
     FrtTermDocEnum *tde = ir_term_docs_for(ir, tq->field, tq->term);
     /* ir_term_docs_for should always return a TermDocEnum */
@@ -151,8 +142,7 @@ static FrtScorer *tw_scorer(FrtWeight *self, FrtIndexReader *ir)
     return tsc_new(self, tde, frt_ir_get_norms(ir, tq->field));
 }
 
-static FrtExplanation *tw_explain(FrtWeight *self, FrtIndexReader *ir, int doc_num)
-{
+static FrtExplanation *tw_explain(FrtWeight *self, FrtIndexReader *ir, int doc_num) {
     FrtExplanation *qnorm_expl;
     FrtExplanation *field_expl;
     FrtScorer *scorer;
@@ -160,7 +150,7 @@ static FrtExplanation *tw_explain(FrtWeight *self, FrtIndexReader *ir, int doc_n
     frt_uchar *field_norms;
     float field_norm;
     FrtExplanation *field_norm_expl;
-    char *query_str = self->query->to_s(self->query, (FrtSymbol)NULL);
+    char *query_str = self->query->to_s(self->query, (ID)NULL);
     FrtTermQuery *tq = TQ(self->query);
     char *term = tq->term;
     FrtExplanation *expl = frt_expl_new(0.0, "weight(%s in %d), product of:", query_str, doc_num);
@@ -203,14 +193,12 @@ static FrtExplanation *tw_explain(FrtWeight *self, FrtIndexReader *ir, int doc_n
     }
 }
 
-static char *tw_to_s(FrtWeight *self)
-{
+static char *tw_to_s(FrtWeight *self) {
     return frt_strfmt("TermWeight(%f)", self->value);
 }
 
-static FrtWeight *tw_new(FrtQuery *query, FrtSearcher *searcher)
-{
-    FrtWeight *self    = w_new(FrtWeight, query);
+static FrtWeight *tw_new(FrtQuery *query, FrtSearcher *searcher) {
+    FrtWeight *self = w_new(FrtWeight, query);
     self->scorer    = &tw_scorer;
     self->explain   = &tw_explain;
     self->to_s      = &tw_to_s;
@@ -231,14 +219,12 @@ static FrtWeight *tw_new(FrtQuery *query, FrtSearcher *searcher)
  *
  ***************************************************************************/
 
-static void tq_destroy(FrtQuery *self)
-{
+static void tq_destroy(FrtQuery *self) {
     free(TQ(self)->term);
     frt_q_destroy_i(self);
 }
 
-static char *tq_to_s(FrtQuery *self, FrtSymbol default_field)
-{
+static char *tq_to_s(FrtQuery *self, ID default_field) {
     const char *field_name = rb_id2name(TQ(self)->field);
     size_t flen = strlen(field_name);
     const char *term = TQ(self)->term;
@@ -260,25 +246,19 @@ static char *tq_to_s(FrtQuery *self, FrtSymbol default_field)
     return buffer;
 }
 
-static void tq_extract_terms(FrtQuery *self, FrtHashSet *terms)
-{
+static void tq_extract_terms(FrtQuery *self, FrtHashSet *terms) {
     frt_hs_add(terms, frt_term_new(TQ(self)->field, TQ(self)->term));
 }
 
-static unsigned long long tq_hash(FrtQuery *self)
-{
+static unsigned long long tq_hash(FrtQuery *self) {
     return frt_str_hash(TQ(self)->term) ^ frt_str_hash(rb_id2name(TQ(self)->field));
 }
 
-static int tq_eq(FrtQuery *self, FrtQuery *o)
-{
-    return (strcmp(TQ(self)->term, TQ(o)->term) == 0)
-        && (TQ(self)->field == TQ(o)->field);
+static int tq_eq(FrtQuery *self, FrtQuery *o) {
+    return (strcmp(TQ(self)->term, TQ(o)->term) == 0) && (TQ(self)->field == TQ(o)->field);
 }
 
-static FrtMatchVector *tq_get_matchv_i(FrtQuery *self, FrtMatchVector *mv,
-                                    FrtTermVector *tv)
-{
+static FrtMatchVector *tq_get_matchv_i(FrtQuery *self, FrtMatchVector *mv, FrtTermVector *tv) {
     if (tv->field == TQ(self)->field) {
         int i;
         FrtTVTerm *tv_term = frt_tv_get_tv_term(tv, TQ(self)->term);
@@ -292,9 +272,11 @@ static FrtMatchVector *tq_get_matchv_i(FrtQuery *self, FrtMatchVector *mv,
     return mv;
 }
 
-FrtQuery *frt_tq_new(FrtSymbol field, const char *term)
-{
-    FrtQuery *self          = frt_q_new(FrtTermQuery);
+FrtQuery *frt_tq_alloc(void) {
+    return frt_q_new(FrtTermQuery);
+}
+
+FrtQuery *frt_tq_init(FrtQuery *self, ID field, const char *term) {
     TQ(self)->field         = field;
     TQ(self)->term          = frt_estrdup(term);
     self->type              = TERM_QUERY;
@@ -309,3 +291,8 @@ FrtQuery *frt_tq_new(FrtSymbol field, const char *term)
 
     return self;
 }
+
+FrtQuery *frt_tq_new(ID field, const char *term) {
+    FrtQuery *self          = frt_tq_alloc();
+    return frt_tq_init(self, field, term);
+}

data/ext/isomorfeus_ferret_ext/frt_q_wildcard.c

@@ -2,6 +2,8 @@
 #include "frt_global.h"
 #include "frt_search.h"
 
+#undef close
+
 /****************************************************************************
  *
  * FrtWildCardQuery
@@ -10,8 +12,7 @@
 
 #define WCQ(query) ((FrtWildCardQuery *)(query))
 
-static char *wcq_to_s(FrtQuery *self, FrtSymbol default_field)
-{
+static char *wcq_to_s(FrtQuery *self, ID default_field) {
     char *buffer, *bptr;
     const char *field_name = rb_id2name(WCQ(self)->field);
     const char *pattern = WCQ(self)->pattern;
@@ -30,8 +31,7 @@ static char *wcq_to_s(FrtQuery *self, FrtSymbol default_field)
     return buffer;
 }
 
-bool frt_wc_match(const char *pattern, const char *text)
-{
+bool frt_wc_match(const char *pattern, const char *text) {
     const char *p = pattern, *t = text, *xt;
 
     /* include '\0' as we need to match empty string */
@@ -77,8 +77,7 @@ bool frt_wc_match(const char *pattern, const char *text)
     return false;
 }
 
-static FrtQuery *wcq_rewrite(FrtQuery *self, FrtIndexReader *ir)
-{
+static FrtQuery *wcq_rewrite(FrtQuery *self, FrtIndexReader *ir) {
     FrtQuery *q;
     const char *pattern = WCQ(self)->pattern;
     const char *first_star = strchr(pattern, FRT_WILD_STRING);
@@ -129,30 +128,28 @@ static FrtQuery *wcq_rewrite(FrtQuery *self, FrtIndexReader *ir)
     return q;
 }
 
-static void wcq_destroy(FrtQuery *self)
-{
+static void wcq_destroy(FrtQuery *self) {
     free(WCQ(self)->pattern);
     frt_q_destroy_i(self);
 }
 
-static unsigned long long wcq_hash(FrtQuery *self)
-{
+static unsigned long long wcq_hash(FrtQuery *self) {
     return frt_str_hash(rb_id2name(WCQ(self)->field)) ^ frt_str_hash(WCQ(self)->pattern);
 }
 
-static int wcq_eq(FrtQuery *self, FrtQuery *o)
-{
+static int wcq_eq(FrtQuery *self, FrtQuery *o) {
     return (strcmp(WCQ(self)->pattern, WCQ(o)->pattern) == 0)
         && (WCQ(self)->field == WCQ(o)->field);
 }
 
-FrtQuery *frt_wcq_new(FrtSymbol field, const char *pattern)
-{
-    FrtQuery *self = frt_q_new(FrtWildCardQuery);
+FrtQuery *frt_wcq_alloc(void) {
+    return frt_q_new(FrtWildCardQuery);
+}
 
+FrtQuery *frt_wcq_init(FrtQuery *self, ID field, const char *pattern) {
     WCQ(self)->field        = field;
     WCQ(self)->pattern      = frt_estrdup(pattern);
-    FrtMTQMaxTerms(self)       = FRT_WILD_CARD_QUERY_MAX_TERMS;
+    FrtMTQMaxTerms(self)    = FRT_WILD_CARD_QUERY_MAX_TERMS;
 
     self->type              = WILD_CARD_QUERY;
     self->rewrite           = &wcq_rewrite;
@@ -164,3 +161,8 @@ FrtQuery *frt_wcq_new(FrtSymbol field, const char *pattern)
 
     return self;
 }
+
+FrtQuery *frt_wcq_new(ID field, const char *pattern) {
+    FrtQuery *self = frt_wcq_alloc();
+    return frt_wcq_init(self, field, pattern);
+}

data/ext/isomorfeus_ferret_ext/frt_ram_store.c

@@ -1,8 +1,7 @@
 #include "frt_store.h"
 #include <string.h>
 
-static FrtRAMFile *rf_new(const char *name)
-{
+static FrtRAMFile *rf_new(const char *name) {
     FrtRAMFile *rf = FRT_ALLOC(FrtRAMFile);
     rf->buffers = FRT_ALLOC(frt_uchar *);
     rf->buffers[0] = FRT_ALLOC_N(frt_uchar, FRT_BUFFER_SIZE);
@@ -13,16 +12,14 @@ static FrtRAMFile *rf_new(const char *name)
     return rf;
 }
 
-static void rf_extend_if_necessary(FrtRAMFile *rf, int buf_num)
-{
+static void rf_extend_if_necessary(FrtRAMFile *rf, int buf_num) {
     while (rf->bufcnt <= buf_num) {
         FRT_REALLOC_N(rf->buffers, frt_uchar *, (rf->bufcnt + 1));
         rf->buffers[rf->bufcnt++] = FRT_ALLOC_N(frt_uchar, FRT_BUFFER_SIZE);
     }
 }
 
-static void rf_close(void *p)
-{
+static void rf_close(void *p) {
     int i;
     FrtRAMFile *rf = (FrtRAMFile *)p;
     if (rf->ref_cnt > 0) {
@@ -36,38 +33,32 @@ static void rf_close(void *p)
     free(rf);
 }
 
-static void ram_touch(FrtStore *store, const char *filename)
-{
+static void ram_touch(FrtStore *store, const char *filename) {
     if (frt_h_get(store->dir.ht, filename) == NULL) {
         frt_h_set(store->dir.ht, filename, rf_new(filename));
     }
 }
 
-static int ram_exists(FrtStore *store, const char *filename)
-{
+static int ram_exists(FrtStore *store, const char *filename) {
     if (frt_h_get(store->dir.ht, filename) != NULL) {
         return true;
-    }
-    else {
+    } else {
         return false;
     }
 }
 
-static int ram_remove(FrtStore *store, const char *filename)
-{
+static int ram_remove(FrtStore *store, const char *filename) {
     FrtRAMFile *rf = (FrtRAMFile *)frt_h_rem(store->dir.ht, filename, false);
     if (rf != NULL) {
         FRT_DEREF(rf);
         rf_close(rf);
         return true;
-    }
-    else {
+    } else {
         return false;
     }
 }
 
-static void ram_rename(FrtStore *store, const char *from, const char *to)
-{
+static void ram_rename(FrtStore *store, const char *from, const char *to) {
     FrtRAMFile *rf = (FrtRAMFile *)frt_h_rem(store->dir.ht, from, false);
     FrtRAMFile *tmp;
 
@@ -89,14 +80,11 @@ static void ram_rename(FrtStore *store, const char *from, const char *to)
     frt_h_set(store->dir.ht, rf->name, rf);
 }
 
-static int ram_count(FrtStore *store)
-{
+static int ram_count(FrtStore *store) {
     return store->dir.ht->size;
 }
 
-static void ram_each(FrtStore *store,
-                     void (*func)(const char *fname, void *arg), void *arg)
-{
+static void ram_each(FrtStore *store, void (*func)(const char *fname, void *arg), void *arg) {
     FrtHash *ht = store->dir.ht;
     int i;
     for (i = 0; i <= ht->mask; i++) {
@@ -110,8 +98,7 @@ static void ram_each(FrtStore *store,
     }
 }
 
-static void ram_close_i(FrtStore *store)
-{
+static void ram_close_i(FrtStore *store) {
     FrtHash *ht = store->dir.ht;
     int i;
     for (i = 0; i <= ht->mask; i++) {
@@ -127,8 +114,7 @@ static void ram_close_i(FrtStore *store)
 /*
  * Be sure to keep the locks
  */
-static void ram_clear(FrtStore *store)
-{
+static void ram_clear(FrtStore *store) {
     int i;
     FrtHash *ht = store->dir.ht;
     for (i = 0; i <= ht->mask; i++) {
@@ -140,8 +126,7 @@ static void ram_clear(FrtStore *store)
     }
 }
 
-static void ram_clear_locks(FrtStore *store)
-{
+static void ram_clear_locks(FrtStore *store) {
     int i;
     FrtHash *ht = store->dir.ht;
     for (i = 0; i <= ht->mask; i++) {
@@ -153,8 +138,7 @@ static void ram_clear_locks(FrtStore *store)
     }
 }
 
-static void ram_clear_all(FrtStore *store)
-{
+static void ram_clear_all(FrtStore *store) {
     int i;
     FrtHash *ht = store->dir.ht;
     for (i = 0; i <= ht->mask; i++) {
@@ -166,19 +150,16 @@ static void ram_clear_all(FrtStore *store)
     }
 }
 
-static off_t ram_length(FrtStore *store, const char *filename)
-{
+static off_t ram_length(FrtStore *store, const char *filename) {
     FrtRAMFile *rf = (FrtRAMFile *)frt_h_get(store->dir.ht, filename);
     if (rf != NULL) {
         return rf->len;
-    }
-    else {
+    } else {
         return 0;
     }
 }
 
-static void ramo_flush_i(FrtOutStream *os, const frt_uchar *src, int len)
-{
+static void ramo_flush_i(FrtOutStream *os, const frt_uchar *src, int len) {
     if (len == 0) { return; }
     frt_uchar *buffer;
     FrtRAMFile *rf = os->file.rf;
@@ -212,26 +193,22 @@ static void ramo_flush_i(FrtOutStream *os, const frt_uchar *src, int len)
     }
 }
 
-static void ramo_seek_i(FrtOutStream *os, off_t pos)
-{
+static void ramo_seek_i(FrtOutStream *os, off_t pos) {
     os->pointer = pos;
 }
 
-void frt_ramo_reset(FrtOutStream *os)
-{
+void frt_ramo_reset(FrtOutStream *os) {
     frt_os_seek(os, 0);
     os->file.rf->len = 0;
 }
 
-static void ramo_close_i(FrtOutStream *os)
-{
+static void ramo_close_i(FrtOutStream *os) {
     FrtRAMFile *rf = os->file.rf;
     FRT_DEREF(rf);
     rf_close(rf);
 }
 
-void frt_ramo_write_to(FrtOutStream *os, FrtOutStream *other_o)
-{
+void frt_ramo_write_to(FrtOutStream *os, FrtOutStream *other_o) {
     int i, len;
     FrtRAMFile *rf = os->file.rf;
     int last_buffer_number;
@@ -252,8 +229,7 @@ static const struct FrtOutStreamMethods RAM_OUT_STREAM_METHODS = {
     ramo_close_i
 };
 
-FrtOutStream *frt_ram_new_buffer()
-{
+FrtOutStream *frt_ram_new_buffer(void) {
     FrtRAMFile *rf = rf_new("");
     FrtOutStream *os = frt_os_new();
 
@@ -264,14 +240,12 @@ FrtOutStream *frt_ram_new_buffer()
     return os;
 }
 
-void frt_ram_destroy_buffer(FrtOutStream *os)
-{
+void frt_ram_destroy_buffer(FrtOutStream *os) {
     rf_close(os->file.rf);
     free(os);
 }
 
-static FrtOutStream *ram_new_output(FrtStore *store, const char *filename)
-{
+static FrtOutStream *ram_new_output(FrtStore *store, const char *filename) {
     FrtRAMFile *rf = (FrtRAMFile *)frt_h_get(store->dir.ht, filename);
     FrtOutStream *os = frt_os_new();
 
@@ -286,8 +260,7 @@ static FrtOutStream *ram_new_output(FrtStore *store, const char *filename)
     return os;
 }
 
-static void rami_read_i(FrtInStream *is, frt_uchar *b, int len)
-{
+static void rami_read_i(FrtInStream *is, frt_uchar *b, int len) {
     FrtRAMFile *rf = is->file.rf;
 
     int offset = 0;
@@ -303,8 +276,7 @@ static void rami_read_i(FrtInStream *is, frt_uchar *b, int len)
 
         if (bytes_in_buffer >= remainder) {
             bytes_to_copy = remainder;
-        }
-        else {
+        } else {
             bytes_to_copy = bytes_in_buffer;
         }
         buffer = rf->buffers[buffer_number];
@@ -317,18 +289,15 @@ static void rami_read_i(FrtInStream *is, frt_uchar *b, int len)
     is->d.pointer += len;
 }
 
-static off_t rami_length_i(FrtInStream *is)
-{
+static off_t rami_length_i(FrtInStream *is) {
     return is->file.rf->len;
 }
 
-static void rami_seek_i(FrtInStream *is, off_t pos)
-{
+static void rami_seek_i(FrtInStream *is, off_t pos) {
     is->d.pointer = pos;
 }
 
-static void rami_close_i(FrtInStream *is)
-{
+static void rami_close_i(FrtInStream *is) {
     FrtRAMFile *rf = is->file.rf;
     FRT_DEREF(rf);
     rf_close(rf);
@@ -341,8 +310,7 @@ static const struct FrtInStreamMethods RAM_IN_STREAM_METHODS = {
     rami_close_i
 };
 
-static FrtInStream *ram_open_input(FrtStore *store, const char *filename)
-{
+static FrtInStream *ram_open_input(FrtStore *store, const char *filename) {
     FrtRAMFile *rf = (FrtRAMFile *)frt_h_get(store->dir.ht, filename);
     FrtInStream *is = NULL;
 
@@ -360,8 +328,7 @@ static FrtInStream *ram_open_input(FrtStore *store, const char *filename)
 
 #define LOCK_OBTAIN_TIMEOUT 5
 
-static int ram_lock_obtain(FrtLock *lock)
-{
+static int ram_lock_obtain(FrtLock *lock) {
     int ret = true;
     if (ram_exists(lock->store, lock->name)) {
         ret = false;
@@ -370,18 +337,15 @@ static int ram_lock_obtain(FrtLock *lock)
     return ret;
 }
 
-static int ram_lock_is_locked(FrtLock *lock)
-{
+static int ram_lock_is_locked(FrtLock *lock) {
     return ram_exists(lock->store, lock->name);
 }
 
-static void ram_lock_release(FrtLock *lock)
-{
+static void ram_lock_release(FrtLock *lock) {
     ram_remove(lock->store, lock->name);
 }
 
-static FrtLock *ram_open_lock_i(FrtStore *store, const char *lockname)
-{
+static FrtLock *ram_open_lock_i(FrtStore *store, const char *lockname) {
     FrtLock *lock = FRT_ALLOC(FrtLock);
     char lname[100];
     snprintf(lname, 100, "%s%s.lck", FRT_LOCK_PREFIX, lockname);
@@ -390,19 +354,19 @@ static FrtLock *ram_open_lock_i(FrtStore *store, const char *lockname)
     lock->obtain = &ram_lock_obtain;
     lock->release = &ram_lock_release;
     lock->is_locked = &ram_lock_is_locked;
+    lock->rlock = Qnil;
     return lock;
 }
 
-static void ram_close_lock_i(FrtLock *lock)
-{
+static void ram_close_lock_i(FrtLock *lock) {
     free(lock->name);
     free(lock);
 }
 
-
-FrtStore *frt_open_ram_store()
-{
-    FrtStore *new_store = frt_store_new();
+FrtStore *frt_open_ram_store(FrtStore *new_store) {
+    if (new_store == NULL)
+        new_store = frt_store_alloc();
+    frt_store_init(new_store);
 
     new_store->dir.ht       = frt_h_new_str(NULL, rf_close);
     new_store->touch        = &ram_touch;
@@ -423,13 +387,11 @@ FrtStore *frt_open_ram_store()
     return new_store;
 }
 
-struct CopyFileArg
-{
+struct CopyFileArg {
     FrtStore *to_store, *from_store;
 };
 
-static void copy_files(const char *fname, void *arg)
-{
+static void copy_files(const char *fname, void *arg) {
     struct CopyFileArg *cfa = (struct CopyFileArg *)arg;
     FrtOutStream *os = cfa->to_store->new_output(cfa->to_store, fname);
     FrtInStream *is = cfa->from_store->open_input(cfa->from_store, fname);
@@ -444,9 +406,8 @@ static void copy_files(const char *fname, void *arg)
     free(buffer);
 }
 
-FrtStore *frt_open_ram_store_and_copy(FrtStore *from_store, bool close_dir)
-{
-    FrtStore *store = frt_open_ram_store();
+FrtStore *frt_open_ram_store_and_copy(FrtStore *store, FrtStore *from_store, bool close_dir) {
+    store = frt_open_ram_store(store);
     struct CopyFileArg cfa;
     cfa.to_store = store;
     cfa.from_store = from_store;