summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2015-06-14 13:56:43 -0400
committerVsevolod Stakhov <vsevolod@highsecure.ru>2015-06-14 13:56:43 -0400
commit1d5a96e14673835b76f339ce39e3728f8c9d6867 (patch)
treea7b8187e4f1d0d47dc25ff80213b0e8ddd5bf4c6 /src
parent0cc160b9cae8939b96bc7686cd1d39ad74ca3926 (diff)
downloadrspamd-1d5a96e14673835b76f339ce39e3728f8c9d6867.tar.gz
rspamd-1d5a96e14673835b76f339ce39e3728f8c9d6867.zip
Remove useless checks.
Diffstat (limited to 'src')
-rw-r--r--src/libutil/mem_pool.c21
1 files changed, 1 insertions, 20 deletions
diff --git a/src/libutil/mem_pool.c b/src/libutil/mem_pool.c
index 7927fdace..81487e49c 100644
--- a/src/libutil/mem_pool.c
+++ b/src/libutil/mem_pool.c
@@ -80,19 +80,7 @@ pool_chain_new (gsize size)
g_return_val_if_fail (size > 0, NULL);
chain = g_slice_alloc (sizeof (struct _pool_chain));
-
- if (chain == NULL) {
- msg_err ("cannot allocate %z bytes, aborting",
- sizeof (struct _pool_chain));
- abort ();
- }
-
chain->begin = g_slice_alloc (size);
- if (chain->begin == NULL) {
- msg_err ("cannot allocate %z bytes, aborting", size);
- abort ();
- }
-
chain->pos = align_ptr (chain->begin, MEM_ALIGNMENT);
chain->len = size;
chain->next = NULL;
@@ -117,7 +105,7 @@ pool_chain_new_shared (gsize size)
-1,
0);
if (map == MAP_FAILED) {
- msg_err ("cannot allocate %z bytes, aborting", size +
+ msg_err ("cannot allocate %z bytes of shared memory, aborting", size +
sizeof (struct _pool_chain));
abort ();
}
@@ -220,12 +208,6 @@ rspamd_mempool_new (gsize size)
}
new = g_slice_alloc (sizeof (rspamd_mempool_t));
- if (new == NULL) {
- msg_err ("cannot allocate %z bytes, aborting",
- sizeof (rspamd_mempool_t));
- abort ();
- }
-
new->cur_pool = pool_chain_new (size);
new->shared_pool = NULL;
new->cur_pool_tmp = NULL;
@@ -233,7 +215,6 @@ rspamd_mempool_new (gsize size)
/* Set it upon first call of set variable */
new->variables = NULL;
new->elt_len = size;
-
mem_pool_stat->pools_allocated++;
return new;