]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
modules/policy: Merge conflicts were resolved
authorGrigorii Demidov <grigorii.demidov@nic.cz>
Fri, 20 Jan 2017 10:41:55 +0000 (11:41 +0100)
committerGrigorii Demidov <grigorii.demidov@nic.cz>
Fri, 20 Jan 2017 10:41:55 +0000 (11:41 +0100)
1  2 
lib/utils.c

diff --cc lib/utils.c
index 55f0239da94741f8db6cb3ebd489fa925c17f1ea,14d3b777e0099090724afdb24d59853ffc4f7508..803450a89c38c2a0465b8a22fe808a2a9cd70f7c
@@@ -510,18 -509,9 +510,17 @@@ char *kr_module_call(struct kr_context 
  
  void kr_rrset_print(const knot_rrset_t *rr, const char *prefix)
  {
 +#if KNOT_VERSION_HEX < ((2 << 16) | (4 << 8))
        char rrtext[KNOT_DNAME_MAXLEN * 2] = {0};
        knot_rrset_txt_dump(rr, rrtext, sizeof(rrtext), &KNOT_DUMP_STYLE_DEFAULT);
-       printf("%s", rrtext);
+       kr_log_verbose("%s%s", prefix, rrtext);
 +#else
 +      size_t size = 4000;
 +      char *rrtext = malloc(size);
 +      knot_rrset_txt_dump(rr, &rrtext, &size, &KNOT_DUMP_STYLE_DEFAULT);
-       printf("%s", rrtext);
++      kr_log_verbose("%s%s", prefix, rrtext);
 +      free(rrtext);
 +#endif
-       kr_log_verbose("%s%s", prefix, rrtext);
  }
  
  static void flags_to_str(char *dst, const knot_pkt_t *pkt, size_t maxlen)