From 9b600e689d439055d869b8df42b58c560f010ab0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Vavru=C5=A1a?= Date: Wed, 10 Jun 2015 01:52:24 +0200 Subject: [PATCH] lib: cleanup --- daemon/worker.c | 2 +- lib/generic/lru.h | 1 - lib/layer/iterate.c | 2 +- lib/zonecut.c | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/daemon/worker.c b/daemon/worker.c index fb97ac6a6..2f96a8a0e 100644 --- a/daemon/worker.c +++ b/daemon/worker.c @@ -73,7 +73,7 @@ static struct qr_task *qr_task_create(struct worker_ctx *worker, uv_handle_t *ha pool.ctx = array_tail(worker->pools); array_pop(worker->pools); } else { /* No mempool on the freelist, create new one */ - pool.ctx = mp_new (KNOT_WIRE_MAX_PKTSIZE); + pool.ctx = mp_new (16 * CPU_PAGE_SIZE); } /* Create worker task */ diff --git a/lib/generic/lru.h b/lib/generic/lru.h index 1b38708ae..2107e9980 100644 --- a/lib/generic/lru.h +++ b/lib/generic/lru.h @@ -139,7 +139,6 @@ static inline void *lru_slot_set(struct lru_hash_base *lru, const char *key, uin memset(slot, 0, lru->stride); slot->key = malloc(len); if (!slot->key) { - slot->len = 0; return NULL; } memcpy(slot->key, key, len); diff --git a/lib/layer/iterate.c b/lib/layer/iterate.c index d0375f1cf..814893d16 100644 --- a/lib/layer/iterate.c +++ b/lib/layer/iterate.c @@ -57,7 +57,7 @@ static const knot_dname_t *minimized_qname(struct kr_query *query, uint16_t *qty /* Minimize name to contain current zone cut + 1 label. */ int cut_labels = knot_dname_labels(query->zone_cut.name, NULL); int qname_labels = knot_dname_labels(qname, NULL); - while(qname_labels > cut_labels + 1) { + while(qname[0] && qname_labels > cut_labels + 1) { qname = knot_wire_next_label(qname, NULL); qname_labels -= 1; } diff --git a/lib/zonecut.c b/lib/zonecut.c index d779b482d..810dc96a3 100644 --- a/lib/zonecut.c +++ b/lib/zonecut.c @@ -261,7 +261,7 @@ int kr_zonecut_find_cached(struct kr_context *ctx, struct kr_zonecut *cut, const update_cut_name(cut, name); return kr_ok(); } - if (!name || !name[0]) { + if (name[0] == '\0') { break; } /* Subtract label from QNAME. */ -- 2.47.3