1 files changed, 53 insertions, 24 deletions

diff --git a/src/imap.c b/src/imap.c
index b6d2110..d1ed619 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -5,14 +5,16 @@
 #include <string.h>
 
 
-static int imap_cmp_func (const void *a, const void *b) {
+static int imap_cmp_func (const void *in_a, const void *in_b) {
+	const prne_imap_tuple_t *a = (const prne_imap_tuple_t*)in_a;
+	const prne_imap_tuple_t *b = (const prne_imap_tuple_t*)in_b;
+
 	return
-		((const prne_imap_tuple_t*)a)->key < ((const prne_imap_tuple_t*)b)->key ? -1 :
-		((const prne_imap_tuple_t*)a)->key > ((const prne_imap_tuple_t*)b)->key ? 1 :
+		a->key < b->key ? -1 :
+		a->key > b->key ? 1 :
 		0;
 }
 
-
 void prne_init_imap (prne_imap_t *im) {
 	im->tbl = NULL;
 	im->size = 0;
@@ -30,14 +32,23 @@ void prne_imap_clear (prne_imap_t *im) {
 	im->size = 0;
 }
 
-const prne_imap_tuple_t *prne_imap_insert (prne_imap_t *im, const prne_imap_key_type_t key, const prne_imap_val_type_t val) {
+const prne_imap_tuple_t *prne_imap_insert (
+	prne_imap_t *im,
+	const prne_imap_key_type_t key,
+	const prne_imap_val_type_t val)
+{
 	prne_imap_tuple_t *ret;
 	prne_imap_tuple_t t;
 
 	t.key = key;
 	t.val = val;
 
-	ret = (prne_imap_tuple_t*)bsearch(&t, im->tbl, im->size, sizeof(prne_imap_tuple_t), imap_cmp_func);
+	ret = (prne_imap_tuple_t*)bsearch(
+		&t,
+		im->tbl,
+		im->size,
+		sizeof(prne_imap_tuple_t),
+		imap_cmp_func);
 	if (ret == NULL) {
 		void *ny_mem;
 
@@ -66,31 +77,49 @@ void prne_imap_erase (prne_imap_t *im, const prne_imap_key_type_t key) {
 	t.key = key;
 	t.val = 0;
 
-	ext = bsearch(&t, im->tbl, im->size, sizeof(prne_imap_tuple_t), imap_cmp_func);
-	if (ext != NULL) {
-		if (im->size - 1 == 0) {
-			prne_free(im->tbl);
-			im->tbl = NULL;
-			im->size = 0;
-		}
-		else {
-			void *ny_mem;
-
-			memmove(ext, ext + 1, sizeof(prne_imap_tuple_t) * (im->size - 1 - (ext - im->tbl)));
-			im->size -= 1;
-			ny_mem = prne_realloc(im->tbl, sizeof(prne_imap_tuple_t), im->size);
-			if (ny_mem != NULL) {
-				im->tbl = (prne_imap_tuple_t*)ny_mem;
-			}
+	ext = bsearch(
+		&t,
+		im->tbl,
+		im->size,
+		sizeof(prne_imap_tuple_t),
+		imap_cmp_func);
+	if (ext == NULL) {
+		return;
+	}
+
+	if (im->size - 1 == 0) {
+		prne_free(im->tbl);
+		im->tbl = NULL;
+		im->size = 0;
+	}
+	else {
+		void *ny_mem;
+
+		memmove(
+			ext,
+			ext + 1,
+			sizeof(prne_imap_tuple_t) * (im->size - 1 - (ext - im->tbl)));
+		im->size -= 1;
+		ny_mem = prne_realloc(im->tbl, sizeof(prne_imap_tuple_t), im->size);
+		if (ny_mem != NULL) {
+			im->tbl = (prne_imap_tuple_t*)ny_mem;
 		}
 	}
 }
 
-const prne_imap_tuple_t *prne_imap_lookup (prne_imap_t *im, const prne_imap_key_type_t key) {
+const prne_imap_tuple_t *prne_imap_lookup (
+	prne_imap_t *im,
+	const prne_imap_key_type_t key)
+{
 	prne_imap_tuple_t t;
 
 	t.key = key;
 	t.val = 0;
 
-	return (const prne_imap_tuple_t*)bsearch(&t, im->tbl, im->size, sizeof(prne_imap_tuple_t), imap_cmp_func);
+	return (const prne_imap_tuple_t*)bsearch(
+		&t,
+		im->tbl,
+		im->size,
+		sizeof(prne_imap_tuple_t),
+		imap_cmp_func);
 }