isomorfeus-ferret 0.17.1 → 0.17.3

data/ext/isomorfeus_ferret_ext/frt_hashset.c

@@ -7,8 +7,7 @@
  * over all alements in the HashSet. It also uses a Hash to keep track of
  * which elements have been added and their index in the +elems+ array.
  */
-static FrtHashSet *hs_alloc(frt_free_ft free_func)
-{
+static FrtHashSet *hs_alloc(frt_free_ft free_func) {
     FrtHashSet *hs = FRT_ALLOC(FrtHashSet);
     hs->size = 0;
     hs->first = hs->last = NULL;
@@ -16,29 +15,25 @@ static FrtHashSet *hs_alloc(frt_free_ft free_func)
     return hs;
 }
 
-FrtHashSet *frt_hs_new(frt_hash_ft hash_func, frt_eq_ft eq_func, frt_free_ft free_func)
-{
+FrtHashSet *frt_hs_new(frt_hash_ft hash_func, frt_eq_ft eq_func, frt_free_ft free_func) {
     FrtHashSet *hs = hs_alloc(free_func);
     hs->ht = frt_h_new(hash_func, eq_func, NULL, NULL);
     return hs;
 }
 
-FrtHashSet *frt_hs_new_str(frt_free_ft free_func)
-{
+FrtHashSet *frt_hs_new_str(frt_free_ft free_func) {
     FrtHashSet *hs = hs_alloc(free_func);
     hs->ht = frt_h_new_str((frt_free_ft) NULL, NULL);
     return hs;
 }
 
-FrtHashSet *frt_hs_new_ptr(frt_free_ft free_func)
-{
+FrtHashSet *frt_hs_new_ptr(frt_free_ft free_func) {
     FrtHashSet *hs = hs_alloc(free_func);
     hs->ht = frt_h_new_ptr(NULL);
     return hs;
 }
 
-static void hs_clear(FrtHashSet *hs, bool destroy)
-{
+static void hs_clear(FrtHashSet *hs, bool destroy) {
     FrtHashSetEntry *curr, *next = hs->first;
     frt_free_ft do_free = destroy ? hs->free_elem_i : &frt_dummy_free;
     while (NULL != (curr = next)) {
@@ -50,36 +45,31 @@ static void hs_clear(FrtHashSet *hs, bool destroy)
     hs->size = 0;
 }
 
-void frt_hs_clear(FrtHashSet *hs)
-{
+void frt_hs_clear(FrtHashSet *hs) {
     hs_clear(hs, true);
     frt_h_clear(hs->ht);
 }
 
-void frt_hs_free(FrtHashSet *hs)
-{
+void frt_hs_free(FrtHashSet *hs) {
     hs_clear(hs, false);
     frt_h_destroy(hs->ht);
     free(hs);
 }
 
-void frt_hs_destroy(FrtHashSet *hs)
-{
+void frt_hs_destroy(FrtHashSet *hs) {
     hs_clear(hs, true);
     frt_h_destroy(hs->ht);
     free(hs);
 }
 
-static void append(FrtHashSet *hs, void *elem)
-{
+static void append(FrtHashSet *hs, void *elem) {
     FrtHashSetEntry *entry = FRT_ALLOC(FrtHashSetEntry);
     entry->elem = elem;
     entry->prev = hs->last;
     entry->next = NULL;
     if (!hs->first) {
         hs->first = hs->last = entry;
-    }
-    else {
+    } else {
         hs->last->next = entry;
         hs->last = entry;
     }
@@ -87,8 +77,7 @@ static void append(FrtHashSet *hs, void *elem)
     hs->size++;
 }
 
-FrtHashKeyStatus frt_hs_add(FrtHashSet *hs, void *elem)
-{
+FrtHashKeyStatus frt_hs_add(FrtHashSet *hs, void *elem) {
     FrtHashKeyStatus has_elem = frt_h_has_key(hs->ht, elem);
     switch (has_elem)
     {
@@ -111,8 +100,7 @@ FrtHashKeyStatus frt_hs_add(FrtHashSet *hs, void *elem)
     return has_elem;
 }
 
-int frt_hs_add_safe(FrtHashSet *hs, void *elem)
-{
+int frt_hs_add_safe(FrtHashSet *hs, void *elem) {
     switch(frt_h_has_key(hs->ht, elem))
     {
         /* element can't be added */
@@ -128,24 +116,20 @@ int frt_hs_add_safe(FrtHashSet *hs, void *elem)
     return true;
 }
 
-void *frt_hs_rem(FrtHashSet *hs, const void *elem)
-{
+void *frt_hs_rem(FrtHashSet *hs, const void *elem) {
     void *return_elem;
     FrtHashSetEntry *entry = (FrtHashSetEntry *)frt_h_get(hs->ht, elem);
     if (entry == NULL) return NULL;
 
     if (hs->first == hs->last) {
         hs->first = hs->last = NULL;
-    }
-    else if (hs->first == entry) {
+    } else if (hs->first == entry) {
         hs->first = entry->next;
         hs->first->prev = NULL;
-    }
-    else if (hs->last == entry) {
+    } else if (hs->last == entry) {
         hs->last = entry->prev;
         hs->last->next = NULL;
-    }
-    else {
+    } else {
         entry->prev->next = entry->next;
         entry->next->prev = entry->prev;
     }
@@ -156,8 +140,7 @@ void *frt_hs_rem(FrtHashSet *hs, const void *elem)
     return return_elem;
 }
 
-int frt_hs_del(FrtHashSet *hs, const void *elem)
-{
+int frt_hs_del(FrtHashSet *hs, const void *elem) {
     void *tmp_elem = frt_hs_rem(hs, elem);
     if (tmp_elem != NULL) {
         hs->free_elem_i(tmp_elem);
@@ -166,13 +149,11 @@ int frt_hs_del(FrtHashSet *hs, const void *elem)
     return 0;
 }
 
-FrtHashKeyStatus frt_hs_exists(FrtHashSet *hs, const void *elem)
-{
+FrtHashKeyStatus frt_hs_exists(FrtHashSet *hs, const void *elem) {
     return frt_h_has_key(hs->ht, elem);
 }
 
-FrtHashSet *frt_hs_merge(FrtHashSet *hs, FrtHashSet * other)
-{
+FrtHashSet *frt_hs_merge(FrtHashSet *hs, FrtHashSet * other) {
     FrtHashSetEntry *entry = other->first;
     for (; entry != NULL; entry = entry->next) {
         frt_hs_add(hs, entry->elem);
@@ -184,8 +165,7 @@ FrtHashSet *frt_hs_merge(FrtHashSet *hs, FrtHashSet * other)
     return hs;
 }
 
-void *frt_hs_orig(FrtHashSet *hs, const void *elem)
-{
+void *frt_hs_orig(FrtHashSet *hs, const void *elem) {
     FrtHashSetEntry *entry = (FrtHashSetEntry *)frt_h_get(hs->ht, elem);
     return entry ? entry->elem : NULL;
 }

data/ext/isomorfeus_ferret_ext/frt_hashset.h

@@ -10,8 +10,7 @@ typedef struct FrtHashSetEntry {
     struct FrtHashSetEntry *prev;
 } FrtHashSetEntry;
 
-typedef struct FrtHashSet
-{
+typedef struct FrtHashSet {
     /* the number of elements in the instance */
     int size;
 

data/ext/isomorfeus_ferret_ext/frt_helper.c

@@ -1,8 +1,6 @@
 #include "frt_helper.h"
 
-int frt_hlp_string_diff(register const char *const s1,
-                           register const char *const s2)
-{
+int frt_hlp_string_diff(register const char *const s1, register const char *const s2) {
     register int i = 0;
     while (s1[i] && (s1[i] == s2[i])) {
         i++;
@@ -10,26 +8,22 @@ int frt_hlp_string_diff(register const char *const s1,
     return i;
 }
 
-frt_i32 frt_float2int(float f)
-{
+frt_i32 frt_float2int(float f) {
     union { frt_i32 i; float f; } tmp;
     tmp.f = f;
     return tmp.i;
 }
 
-float frt_int2float(frt_i32 v)
-{
+float frt_int2float(frt_i32 v) {
     union { frt_i32 i; float f; } tmp;
     tmp.i = v;
     return tmp.f;
 }
 
-float frt_byte2float(unsigned char b)
-{
+float frt_byte2float(unsigned char b) {
     if (b == 0) {
         return 0.0;
-    }
-    else {
+    } else {
         frt_u32 mantissa = b & 0x07;
         frt_u32 exponent = (b >> 3) & 0x1f;
 
@@ -37,12 +31,10 @@ float frt_byte2float(unsigned char b)
     }
 }
 
-unsigned char frt_float2byte(float f)
-{
+unsigned char frt_float2byte(float f) {
     if (f <= 0.0) {
         return 0;
-    }
-    else {
+    } else {
         /* correctly order the bytes for encoding */
         frt_u32 i = frt_float2int(f);
         int mantissa = (i & 0xEf0000) >> 21;