Skip to content
Snippets Groups Projects
Commit beddd369 authored by Lubos Slovak's avatar Lubos Slovak
Browse files

Replaced printf in debug dumps by fprintf.

parent 3acd28f1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 47 additions and 47 deletions
libknot/util/debug.c
+ 47
− 47
View file @ beddd369
......@@ -28,10 +28,10 @@
void knot_rdata_dump(knot_rdata_t *rdata, uint32_t type, char loaded_zone)
{
#if defined(KNOT_ZONE_DEBUG) || defined(KNOT_RDATA_DEBUG)
printf(" ------- RDATA -------\n");
fprintf(stderr, " ------- RDATA -------\n");
if (rdata == NULL) {
printf(" There are no rdata in this RRset!\n");
printf(" ------- RDATA -------\n");
fprintf(stderr, " There are no rdata in this RRset!\n");
fprintf(stderr, " ------- RDATA -------\n");
return;
}
knot_rrtype_descriptor_t *desc = knot_rrtype_descriptor_by_type(type);
......@@ -44,63 +44,63 @@ void knot_rdata_dump(knot_rdata_t *rdata, uint32_t type, char loaded_zone)
desc->wireformat[i] == KNOT_RDATA_WF_LITERAL_DNAME ) {
assert(rdata->items[i].dname != NULL);
name = knot_dname_to_str(rdata->items[i].dname);
printf(" DNAME: %d: %s\n",
fprintf(stderr, " DNAME: %d: %s\n",
i, name);
free(name);
if (loaded_zone) {
if (rdata->items[i].dname->node) {
name =
knot_dname_to_str(rdata->items[i].dname->node->owner);
printf(" Has node owner: %s\n", name);
fprintf(stderr, " Has node owner: %s\n", name);
free(name);
} else {
printf(" No node set\n");
fprintf(stderr, " No node set\n");
}
}
printf(" labels: ");
fprintf(stderr, " labels: ");
hex_print((char *)rdata->items[i].dname->labels,
rdata->items[i].dname->label_count);
} else {
assert(rdata->items[i].raw_data != NULL);
printf(" %d: raw_data: length: %d\n", i,
fprintf(stderr, " %d: raw_data: length: %d\n", i,
*(rdata->items[i].raw_data));
printf(" ");
fprintf(stderr, " ");
hex_print(((char *)(
rdata->items[i].raw_data + 1)),
rdata->items[i].raw_data[0]);
}
}
printf(" ------- RDATA -------\n");
fprintf(stderr, " ------- RDATA -------\n");
#endif
}
void knot_rrset_dump(const knot_rrset_t *rrset, char loaded_zone)
{
#if defined(KNOT_ZONE_DEBUG) || defined(KNOT_RRSET_DEBUG)
printf(" ------- RRSET -------\n");
printf(" %p\n", rrset);
fprintf(stderr, " ------- RRSET -------\n");
fprintf(stderr, " %p\n", rrset);
char *name = knot_dname_to_str(rrset->owner);
printf(" owner: %s\n", name);
fprintf(stderr, " owner: %s\n", name);
free(name);
printf(" type: %s\n", knot_rrtype_to_string(rrset->type));
printf(" class: %d\n", rrset->rclass);
printf(" ttl: %d\n", rrset->ttl);
fprintf(stderr, " type: %s\n", knot_rrtype_to_string(rrset->type));
fprintf(stderr, " class: %d\n", rrset->rclass);
fprintf(stderr, " ttl: %d\n", rrset->ttl);
printf(" RRSIGs:\n");
fprintf(stderr, " RRSIGs:\n");
if (rrset->rrsigs != NULL) {
knot_rrset_dump(rrset->rrsigs, loaded_zone);
} else {
printf(" none\n");
fprintf(stderr, " none\n");
}
if (rrset->rdata == NULL) {
printf(" NO RDATA!\n");
printf(" ------- RRSET -------\n");
fprintf(stderr, " NO RDATA!\n");
fprintf(stderr, " ------- RRSET -------\n");
return;
}
printf(" rdata count: %d\n", rrset->rdata->count);
fprintf(stderr, " rdata count: %d\n", rrset->rdata->count);
knot_rdata_t *tmp = rrset->rdata;
while (tmp->next != rrset->rdata) {
......@@ -110,7 +110,7 @@ void knot_rrset_dump(const knot_rrset_t *rrset, char loaded_zone)
knot_rdata_dump(tmp, rrset->type, loaded_zone);
printf(" ------- RRSET -------\n");
fprintf(stderr, " ------- RRSET -------\n");
#endif
}
......@@ -120,74 +120,74 @@ void knot_node_dump(knot_node_t *node, void *loaded_zone)
//char loaded_zone = *((char*) data);
char *name;
printf("------- NODE --------\n");
fprintf(stderr, "------- NODE --------\n");
name = knot_dname_to_str(node->owner);
printf("owner: %s\n", name);
fprintf(stderr, "owner: %s\n", name);
free(name);
printf("labels: ");
fprintf(stderr, "labels: ");
hex_print((char *)node->owner->labels, node->owner->label_count);
printf("node: %p\n", node);
printf("node (in node's owner): %p\n", node->owner->node);
fprintf(stderr, "node: %p\n", node);
fprintf(stderr, "node (in node's owner): %p\n", node->owner->node);
if (loaded_zone && node->prev != NULL) {
name = knot_dname_to_str(node->prev->owner);
printf("previous node: %s\n", name);
fprintf(stderr, "previous node: %s\n", name);
free(name);
}
if (knot_node_is_deleg_point(node)) {
printf("delegation point\n");
fprintf(stderr, "delegation point\n");
}
if (knot_node_is_non_auth(node)) {
printf("non-authoritative node\n");
fprintf(stderr, "non-authoritative node\n");
}
if (node->parent != NULL) {
name = knot_dname_to_str(node->parent->owner);
printf("parent: %s\n", name);
fprintf(stderr, "parent: %s\n", name);
free(name);
} else {
printf("no parent\n");
fprintf(stderr, "no parent\n");
}
if (node->prev != NULL) {
name = knot_dname_to_str(node->prev->owner);
printf("previous node: %s\n", name);
fprintf(stderr, "previous node: %s\n", name);
free(name);
} else {
printf("previous node: none\n");
fprintf(stderr, "previous node: none\n");
}
knot_rrset_t **rrsets = knot_node_get_rrsets(node);
printf("Wildcard child: ");
fprintf(stderr, "Wildcard child: ");
if (node->wildcard_child != NULL) {
name = knot_dname_to_str(node->wildcard_child->owner);
printf("%s\n", name);
fprintf(stderr, "%s\n", name);
free(name);
} else {
printf("none\n");
fprintf(stderr, "none\n");
}
printf("NSEC3 node: ");
fprintf(stderr, "NSEC3 node: ");
if (node->nsec3_node != NULL) {
name = knot_dname_to_str(node->nsec3_node->owner);
printf("%s\n", name);
fprintf(stderr, "%s\n", name);
free(name);
} else {
printf("none\n");
fprintf(stderr, "none\n");
}
printf("RRSet count: %d\n", node->rrset_count);
fprintf(stderr, "RRSet count: %d\n", node->rrset_count);
for (int i = 0; i < node->rrset_count; i++) {
knot_rrset_dump(rrsets[i], (int) loaded_zone);
}
free(rrsets);
//assert(node->owner->node == node);
printf("------- NODE --------\n");
fprintf(stderr, "------- NODE --------\n");
#endif
}
......@@ -195,20 +195,20 @@ void knot_zone_contents_dump(knot_zone_contents_t *zone, char loaded_zone)
{
#if defined(KNOT_ZONE_DEBUG)
if (!zone) {
printf("------- STUB ZONE --------\n");
fprintf(stderr, "------- STUB ZONE --------\n");
return;
}
printf("------- ZONE --------\n");
fprintf(stderr, "------- ZONE --------\n");
knot_zone_contents_tree_apply_inorder(zone, knot_node_dump, (void *)&loaded_zone);
printf("------- ZONE --------\n");
fprintf(stderr, "------- ZONE --------\n");
printf("------- NSEC 3 tree -\n");
fprintf(stderr, "------- NSEC 3 tree -\n");
knot_zone_contents_nsec3_apply_inorder(zone, knot_node_dump, (void *)&loaded_zone);
printf("------- NSEC 3 tree -\n");
fprintf(stderr, "------- NSEC 3 tree -\n");
#endif
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment