isomorfeus-ferret 0.17.2 → 0.17.3

data/ext/isomorfeus_ferret_ext/frt_multimapper.c

@@ -6,13 +6,11 @@
 #define St(state) ((FrtState *)(state))
 #define UCtoI(val) ((int)(unsigned char)(val))
 
-static void state_destroy(FrtState *state)
-{
+static void state_destroy(FrtState *state) {
     state->destroy_i(state);
 }
 
-typedef struct LetterState
-{
+typedef struct LetterState {
     FrtState super;
     int c;
     int val;
@@ -21,30 +19,25 @@ typedef struct LetterState
 
 #define LSt(state) ((LetterState *)(state))
 
-static int lstate_next(LetterState *self, int c, int *states)
-{
+static int lstate_next(LetterState *self, int c, int *states) {
     if (c == self->c) {
         states[0] = self->val;
         return 1;
-    }
-    else {
+    } else {
         return 0;
     }
 }
 
-static int lstate_is_match(LetterState *self, char **mapping)
-{
+static int lstate_is_match(LetterState *self, char **mapping) {
     if (self->val < 0) {
         *mapping = self->mapping;
         return self->val;
-    }
-    else {
+    } else {
         return 0;
     }
 }
 
-static LetterState *lstate_new(int c, int val)
-{
+static LetterState *lstate_new(int c, int val) {
     LetterState *self   = FRT_ALLOC(LetterState);
     self->c             = c;
     self->val           = val;
@@ -55,28 +48,24 @@ static LetterState *lstate_new(int c, int val)
     return self;
 }
 
-typedef struct NonDeterministicState
-{
+typedef struct NonDeterministicState {
     FrtState super;
     int *states[256];
     int size[256];
     int capa[256];
 } NonDeterministicState;
 
-static int ndstate_next(NonDeterministicState *self, int c, int *states)
-{
+static int ndstate_next(NonDeterministicState *self, int c, int *states) {
     int size = self->size[c];
     memcpy(states, self->states[c], size * sizeof(int));
     return size;
 }
 
-static void ndstate_add(NonDeterministicState *self, int c, int state)
-{
+static void ndstate_add(NonDeterministicState *self, int c, int state) {
     if (self->capa[c] <= self->size[c]) {
         if (self->capa[c] == 0) {
             self->capa[c] = 4;
-        }
-        else {
+        } else {
             self->capa[c] <<= 1;
         }
         FRT_REALLOC_N(self->states[c], int, self->capa[c]);
@@ -92,8 +81,7 @@ static void ndstate_destroy_i(NonDeterministicState *self) {
     free(self);
 }
 
-static int ndstate_is_match(FrtState *self, char **mapping)
-{
+static int ndstate_is_match(FrtState *self, char **mapping) {
     (void)self; (void)mapping;
     return 0;
 }
@@ -118,8 +106,7 @@ FrtMultiMapper *frt_mulmap_new(void) {
     return self;
 }
 
-static void mulmap_free_dstates(FrtMultiMapper *self)
-{
+static void mulmap_free_dstates(FrtMultiMapper *self) {
     if (self->d_size > 0) {
         int i;
         for (i = self->d_size - 1; i >= 0; i--) {
@@ -129,8 +116,7 @@ static void mulmap_free_dstates(FrtMultiMapper *self)
     }
 }
 
-void frt_mulmap_add_mapping(FrtMultiMapper *self, const char *pattern, const char *rep)
-{
+void frt_mulmap_add_mapping(FrtMultiMapper *self, const char *pattern, const char *rep) {
     if (pattern == NULL || pattern[0] == '\0') {
         FRT_RAISE(FRT_ARG_ERROR, "Tried to add empty pattern to multi_mapper");
     } else {
@@ -147,16 +133,14 @@ void frt_mulmap_add_mapping(FrtMultiMapper *self, const char *pattern, const cha
 }
 
 
-static void mulmap_bv_set_states(FrtBitVector *bv, int *states, int cnt)
-{
+static void mulmap_bv_set_states(FrtBitVector *bv, int *states, int cnt) {
     int i;
     for (i = cnt - 1; i >= 0; i--) {
         frt_bv_set(bv, states[i]);
     }
 }
 
-static FrtDeterministicState *mulmap_process_state(FrtMultiMapper *self, FrtBitVector *bv)
-{
+static FrtDeterministicState *mulmap_process_state(FrtMultiMapper *self, FrtBitVector *bv) {
     FrtDeterministicState *current_state
         = (FrtDeterministicState *)frt_h_get(self->dstates_map, bv);
     if (current_state == NULL) {
@@ -197,15 +181,13 @@ static FrtDeterministicState *mulmap_process_state(FrtMultiMapper *self, FrtBitV
             }
             current_state->next[(int)c] = mulmap_process_state(self, nxt_bv);
         }
-    }
-    else {
+    } else {
         frt_bv_destroy(bv);
     }
     return current_state;
 }
 
-void frt_mulmap_compile(FrtMultiMapper *self)
-{
+void frt_mulmap_compile(FrtMultiMapper *self) {
     NonDeterministicState *start = ndstate_new();
     int i, j;
     int size = 1;
@@ -254,8 +236,7 @@ void frt_mulmap_compile(FrtMultiMapper *self)
     free(nstates);
 }
 
-int frt_mulmap_map_len(FrtMultiMapper *self, char *to, char *from, int capa)
-{
+int frt_mulmap_map_len(FrtMultiMapper *self, char *to, char *from, int capa) {
     FrtDeterministicState *start = self->dstates[0];
     FrtDeterministicState *state = start;
     char *s = from, *d = to, *end = to + capa - 1;
@@ -273,8 +254,7 @@ int frt_mulmap_map_len(FrtMultiMapper *self, char *to, char *from, int capa)
             memcpy(d, state->mapping, len);
             d += len;
             state = start;
-        }
-        else {
+        } else {
             *(d++) = *s;
         }
         s++;
@@ -283,15 +263,13 @@ int frt_mulmap_map_len(FrtMultiMapper *self, char *to, char *from, int capa)
     return d - to;
 }
 
-char *frt_mulmap_map(FrtMultiMapper *self, char *to, char *from, int capa)
-{
+char *frt_mulmap_map(FrtMultiMapper *self, char *to, char *from, int capa) {
     frt_mulmap_map_len(self, to, from, capa);
     return to;
 }
 
 /* Maps a string to a dynamically allocated string */
-char *frt_mulmap_dynamic_map(FrtMultiMapper *self, char *from)
-{
+char *frt_mulmap_dynamic_map(FrtMultiMapper *self, char *from) {
     FrtDeterministicState *start = self->dstates[0];
     FrtDeterministicState *state = start;
     int capa = strlen(from);
@@ -312,8 +290,7 @@ char *frt_mulmap_dynamic_map(FrtMultiMapper *self, char *from)
                 memcpy(d, state->mapping, len);
                 d += len;
                 state = start;
-            }
-            else {
+            } else {
                 *(d++) = *s;
             }
             s++;

data/ext/isomorfeus_ferret_ext/frt_multimapper.h

@@ -3,29 +3,25 @@
 
 #include "frt_hash.h"
 
-typedef struct FrtState
-{
+typedef struct FrtState {
     int  (*next)(struct FrtState *self, int c, int *states);
     void (*destroy_i)(struct FrtState *self);
     int  (*is_match)(struct FrtState *self, char **mapping);
 } FrtState;
 
-typedef struct FrtDeterministicState
-{
+typedef struct FrtDeterministicState {
     struct FrtDeterministicState *next[256];
     int longest_match;
     char *mapping;
     int mapping_len;
 } FrtDeterministicState;
 
-typedef struct FrtMapping
-{
+typedef struct FrtMapping {
     char *pattern;
     char *replacement;
 } FrtMapping;
 
-typedef struct FrtMultiMapper
-{
+typedef struct FrtMultiMapper {
     FrtMapping **mappings;
     int size;
     int capa;

data/ext/isomorfeus_ferret_ext/frt_out_stream.c

@@ -1,3 +1,8 @@
+/* prevent warning: #warning Please include winsock2.h before windows.h [-Wcpp] */
+#ifdef _WIN32
+#   include <winsock2.h>
+#endif
+
 #include "brotli_decode.h"
 #include "brotli_encode.h"
 #include "bzlib.h"
@@ -16,6 +21,7 @@
  */
 FrtOutStream *frt_os_new(void) {
     FrtOutStream *os = FRT_ALLOC(FrtOutStream);
+    os->folder_name = NULL;
     os->buf.start = 0;
     os->buf.pos = 0;
     os->buf.len = 0;
@@ -27,27 +33,26 @@ FrtOutStream *frt_os_new(void) {
  *
  * @param the OutStream to flush
  */
-void frt_os_flush(FrtOutStream *os)
-{
+void frt_os_flush(FrtOutStream *os) {
     os->m->flush_i(os, os->buf.buf, os->buf.pos);
     os->buf.start += os->buf.pos;
     os->buf.pos = 0;
 }
 
-void frt_os_close(FrtOutStream *os)
-{
+void frt_os_close(FrtOutStream *os) {
     frt_os_flush(os);
     os->m->close_i(os);
+    if (os->folder_name) {
+        free((void *)os->folder_name);
+    }
     free(os);
 }
 
-off_t frt_os_pos(FrtOutStream *os)
-{
+off_t frt_os_pos(FrtOutStream *os) {
     return os->buf.start + os->buf.pos;
 }
 
-void frt_os_seek(FrtOutStream *os, frt_off_t new_pos)
-{
+void frt_os_seek(FrtOutStream *os, frt_off_t new_pos) {
     frt_os_flush(os);
     os->buf.start = new_pos;
     os->m->seek_i(os, new_pos);
@@ -66,29 +71,25 @@ void frt_os_seek(FrtOutStream *os, frt_off_t new_pos)
  * @param b  the byte to write
  * @raise FRT_IO_ERROR if there is an IO error writing to the filesystem
  */
-void frt_os_write_byte(FrtOutStream *os, frt_uchar b)
-{
+void frt_os_write_byte(FrtOutStream *os, frt_uchar b) {
     if (os->buf.pos >= (FRT_BUFFER_SIZE - 1)) {
         frt_os_flush(os);
     }
     write_byte(os, b);
 }
 
-void frt_os_write_bytes(FrtOutStream *os, const frt_uchar *buf, int len)
-{
+void frt_os_write_bytes(FrtOutStream *os, const frt_uchar *buf, int len) {
     if (len < (FRT_BUFFER_SIZE - os->buf.pos)) {
         memcpy(os->buf.buf + os->buf.pos, buf, len);
         os->buf.pos += len;
-    }
-    else {
+    } else {
         frt_os_flush(os);
         int pos = 0;
         int size;
         while (pos < len) {
             if (len - pos < FRT_BUFFER_SIZE) {
                 size = len - pos;
-            }
-            else {
+            } else {
                 size = FRT_BUFFER_SIZE;
             }
             os->m->flush_i(os, buf + pos, size);
@@ -98,16 +99,14 @@ void frt_os_write_bytes(FrtOutStream *os, const frt_uchar *buf, int len)
     }
 }
 
-void frt_os_write_i32(FrtOutStream *os, frt_i32 num)
-{
+void frt_os_write_i32(FrtOutStream *os, frt_i32 num) {
     frt_os_write_byte(os, (frt_uchar)((num >> 24) & 0xFF));
     frt_os_write_byte(os, (frt_uchar)((num >> 16) & 0xFF));
     frt_os_write_byte(os, (frt_uchar)((num >> 8) & 0xFF));
     frt_os_write_byte(os, (frt_uchar)(num & 0xFF));
 }
 
-void frt_os_write_i64(FrtOutStream *os, frt_i64 num)
-{
+void frt_os_write_i64(FrtOutStream *os, frt_i64 num) {
     frt_os_write_byte(os, (frt_uchar)((num >> 56) & 0xFF));
     frt_os_write_byte(os, (frt_uchar)((num >> 48) & 0xFF));
     frt_os_write_byte(os, (frt_uchar)((num >> 40) & 0xFF));
@@ -118,16 +117,14 @@ void frt_os_write_i64(FrtOutStream *os, frt_i64 num)
     frt_os_write_byte(os, (frt_uchar)(num & 0xFF));
 }
 
-void frt_os_write_u32(FrtOutStream *os, frt_u32 num)
-{
+void frt_os_write_u32(FrtOutStream *os, frt_u32 num) {
     frt_os_write_byte(os, (frt_uchar)((num >> 24) & 0xFF));
     frt_os_write_byte(os, (frt_uchar)((num >> 16) & 0xFF));
     frt_os_write_byte(os, (frt_uchar)((num >> 8) & 0xFF));
     frt_os_write_byte(os, (frt_uchar)(num & 0xFF));
 }
 
-void frt_os_write_u64(FrtOutStream *os, frt_u64 num)
-{
+void frt_os_write_u64(FrtOutStream *os, frt_u64 num) {
     frt_os_write_byte(os, (frt_uchar)((num >> 56) & 0xFF));
     frt_os_write_byte(os, (frt_uchar)((num >> 48) & 0xFF));
     frt_os_write_byte(os, (frt_uchar)((num >> 40) & 0xFF));
@@ -139,16 +136,14 @@ void frt_os_write_u64(FrtOutStream *os, frt_u64 num)
 }
 
 /* optimized to use an unchecked write if there is space */
-void frt_os_write_vint(FrtOutStream *os, register unsigned int num)
-{
+void frt_os_write_vint(FrtOutStream *os, register unsigned int num) {
     if (os->buf.pos > VINT_END) {
         while (num > 127) {
             frt_os_write_byte(os, (frt_uchar)((num & 0x7f) | 0x80));
             num >>= 7;
         }
         frt_os_write_byte(os, (frt_uchar)(num));
-    }
-    else {
+    } else {
         while (num > 127) {
             write_byte(os, (frt_uchar)((num & 0x7f) | 0x80));
             num >>= 7;
@@ -158,16 +153,14 @@ void frt_os_write_vint(FrtOutStream *os, register unsigned int num)
 }
 
 /* optimized to use an unchecked write if there is space */
-void frt_os_write_voff_t(FrtOutStream *os, register frt_off_t num)
-{
+void frt_os_write_voff_t(FrtOutStream *os, register frt_off_t num) {
     if (os->buf.pos > VINT_END) {
         while (num > 127) {
             frt_os_write_byte(os, (frt_uchar)((num & 0x7f) | 0x80));
             num >>= 7;
         }
         frt_os_write_byte(os, (frt_uchar)num);
-    }
-    else {
+    } else {
         while (num > 127) {
             write_byte(os, (frt_uchar)((num & 0x7f) | 0x80));
             num >>= 7;
@@ -177,16 +170,14 @@ void frt_os_write_voff_t(FrtOutStream *os, register frt_off_t num)
 }
 
 /* optimized to use an unchecked write if there is space */
-void frt_os_write_vll(FrtOutStream *os, register frt_u64 num)
-{
+void frt_os_write_vll(FrtOutStream *os, register frt_u64 num) {
     if (os->buf.pos > VINT_END) {
         while (num > 127) {
             frt_os_write_byte(os, (frt_uchar)((num & 0x7f) | 0x80));
             num >>= 7;
         }
         frt_os_write_byte(os, (frt_uchar)num);
-    }
-    else {
+    } else {
         while (num > 127) {
             write_byte(os, (frt_uchar)((num & 0x7f) | 0x80));
             num >>= 7;
@@ -195,14 +186,12 @@ void frt_os_write_vll(FrtOutStream *os, register frt_u64 num)
     }
 }
 
-void frt_os_write_string_len(FrtOutStream *os, const char *str, int len)
-{
+void frt_os_write_string_len(FrtOutStream *os, const char *str, int len) {
     frt_os_write_vint(os, len);
     frt_os_write_bytes(os, (frt_uchar *)str, len);
 }
 
-void frt_os_write_string(FrtOutStream *os, const char *str)
-{
+void frt_os_write_string(FrtOutStream *os, const char *str) {
     frt_os_write_string_len(os, str, (int)strlen(str));
 }
 
@@ -331,8 +320,8 @@ finish:
     return compressed_length;
 }
 
-int frt_os_write_compressed_bytes(FrtOutStream* out_stream, frt_uchar *data, int length, FrtCompressionType compression) {
-    switch (compression) {
+int frt_os_write_compressed_bytes(FrtOutStream* out_stream, frt_uchar *data, int length, FrtCompressionType compression_type) {
+    switch (compression_type) {
         case FRT_COMPRESSION_BROTLI:
             return frt_os_write_brotli_compressed_bytes(out_stream, data, length);
         case FRT_COMPRESSION_BZ2:
@@ -342,5 +331,4 @@ int frt_os_write_compressed_bytes(FrtOutStream* out_stream, frt_uchar *data, int
         default:
             return -1;
     }
-
 }

data/ext/isomorfeus_ferret_ext/frt_out_stream.h

@@ -38,11 +38,11 @@ struct FrtOutStreamMethods {
 };
 
 struct FrtOutStream {
+    const char *folder_name;
     FrtBuffer buf;
     frt_off_t pointer;             /* only used by RAMOut */
     FrtStore  *store;
     union {
-        int fd;
         FrtRAMFile *rf;
     } file;
     const struct FrtOutStreamMethods *m;
@@ -193,6 +193,6 @@ extern void frt_os_write_string_len(FrtOutStream *os,
  */
 extern void frt_os_write_string(FrtOutStream *os, const char *str);
 
-extern int frt_os_write_compressed_bytes(FrtOutStream* out_stream, frt_uchar *data, int length, FrtCompressionType compression);
+extern int frt_os_write_compressed_bytes(FrtOutStream* out_stream, frt_uchar *data, int length, FrtCompressionType compression_type);
 
 #endif