Skip to content

Commit

Permalink
Merge branch 'rel_cleanup' into 'master'
Browse files Browse the repository at this point in the history
Release cleanup

Write a comment or drag your files here...

See merge request !28
  • Loading branch information
Grigorii Demidov committed May 30, 2016
2 parents 550ceca + e3723d1 commit 69eff98
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 11 deletions.
9 changes: 1 addition & 8 deletions lib/resolve.c
Expand Up @@ -55,12 +55,6 @@ static int reset_yield(knot_layer_t *ctx) { return kr_ok(); }
static int finish_yield(knot_layer_t *ctx) { return kr_ok(); }
static int produce_yield(knot_layer_t *ctx, knot_pkt_t *pkt) { return kr_ok(); }

/** Enforce cache flushing in debug mode. */
static void flush_caches(struct kr_request *req) {
if (req->options & QUERY_CACHE_SYNC) {
kr_cache_sync(&req->ctx->cache);
}
}
/** @internal Macro for iterating module layers. */
#define RESUME_LAYERS(from, req, qry, func, ...) \
(req)->current_query = (qry); \
Expand All @@ -76,8 +70,7 @@ static void flush_caches(struct kr_request *req) {
} \
} \
} \
} /* Invalidate current query and maybe flush caches. */ \
flush_caches(req); \
} /* Invalidate current query. */ \
(req)->current_query = NULL

/** @internal Macro for starting module iteration. */
Expand Down
3 changes: 1 addition & 2 deletions lib/rplan.h
Expand Up @@ -46,8 +46,7 @@
X(ALWAYS_CUT, 1 << 18) /**< Always recover zone cut (even if cached). */ \
X(DNSSEC_WEXPAND, 1 << 19) /**< Query response has wildcard expansion. */ \
X(PERMISSIVE, 1 << 20) /**< Permissive resolver mode. */ \
X(STRICT, 1 << 21) /**< Strict resolver mode. */ \
X(CACHE_SYNC, 1 << 22) /**< Sync cache as often as possible. */
X(STRICT, 1 << 21) /**< Strict resolver mode. */

/** Query flags */
enum kr_query_flag {
Expand Down
2 changes: 1 addition & 1 deletion tests/deckard
Submodule deckard updated from 1bdecf to e97631

0 comments on commit 69eff98

Please sign in to comment.