- Fix dnstap for warning of set but not used.

git-svn-id: file:///svn/unbound/trunk@4007 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/dnstap/dnstap.c b/dnstap/dnstap.c
index 6df2fef3f31272d4b384546890016971f0f5d706..5d0420f6fbba2305e8f5984fe6d77b248d57de36 100644 (file)
--- a/dnstap/dnstap.c
+++ b/dnstap/dnstap.c
@@ -121,7 +121,9 @@ dt_msg_init(const struct dt_env *env,
 struct dt_env *
 dt_create(const char *socket_path, unsigned num_workers)
 {
+#ifdef UNBOUND_DEBUG
        fstrm_res res;
+#endif
        struct dt_env *env;
        struct fstrm_iothr_options *fopt;
        struct fstrm_unix_writer_options *fuwopt;
@@ -138,7 +140,12 @@ dt_create(const char *socket_path, unsigned num_workers)
                return NULL;
 
        fwopt = fstrm_writer_options_init();
-       res = fstrm_writer_options_add_content_type(fwopt,
+#ifdef UNBOUND_DEBUG
+       res = 
+#else
+       (void)
+#endif
+           fstrm_writer_options_add_content_type(fwopt,
                DNSTAP_CONTENT_TYPE, sizeof(DNSTAP_CONTENT_TYPE) - 1);
        log_assert(res == fstrm_res_success);
 

diff --git a/doc/Changelog b/doc/Changelog
index 1e030882c14c5b53b711cf85bf67abaaacc69a8d..f8fe42b3ee457d561347503dac0be748afdaeb77 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,7 @@
 10 February 2017: Wouter
        - Fix pythonmod for typedef changes.
+       - Fix dnstap for warning of set but not used.
+       - tag 1.6.1rc2.
 
 9 February 2017: Wouter
        - tag 1.6.1rc1.