convenience print functions

diff --git a/host2str.c b/host2str.c
index 7f7919bdca0e33a4f197447658b21594e7a90925..6d39737e383ab13913c95acf25ac254ab1678dc3 100644 (file)
--- a/host2str.c
+++ b/host2str.c
@@ -886,3 +886,37 @@ ldns_pkt2str(ldns_pkt *pkt)
        ldns_buffer_free(tmp_buffer);
        return result;
 }
+
+void
+ldns_rdf_print(FILE *output, ldns_rdf *rdf)
+{
+       char *str = ldns_rdf2str(rdf);
+       if (str) {
+               fprintf(output, str);
+       } else {
+               fprintf(output, "Unable to convert rdf to string\n");
+       }
+}
+
+void
+ldns_rr_print(FILE *output, ldns_rr *rr)
+{
+       char *str = ldns_rr2str(rr);
+       if (str) {
+               fprintf(output, str);
+       } else {
+               fprintf(output, "Unable to convert rr to string\n");
+       }
+}
+
+void
+ldns_pkt_print(FILE *output, ldns_pkt *pkt)
+{
+       char *str = ldns_pkt2str(pkt);
+       if (str) {
+               fprintf(output, str);
+       } else {
+               fprintf(output, "Unable to convert packet to string\n");
+       }
+}
+

diff --git a/ldns/host2str.h b/ldns/host2str.h
index c56679899eb5817d3c195516def284f2335ea562..1e278ffbdcf76716d87ee7422e658e48ebfdbaa8 100644 (file)
--- a/ldns/host2str.h
+++ b/ldns/host2str.h
@@ -20,6 +20,8 @@ char *ldns_rdf2str(ldns_rdf *);
 char *ldns_rr2str(ldns_rr *);
 char *ldns_pkt2str(ldns_pkt *);
 char *buffer2str(ldns_buffer *);
-
+void ldns_rdf_print(FILE *output, ldns_rdf *rdf);
+void ldns_rr_print(FILE *output, ldns_rr *rr);
+void ldns_pkt_print(FILE *output, ldns_pkt *pkt);
 
 #endif

diff --git a/run-test5.c b/run-test5.c
index 31ba2c4581d55cb294a4b675c72795dd4d801752..84a724276b31d1860c5f12ea57df5b772f32218a 100644 (file)
--- a/run-test5.c
+++ b/run-test5.c
@@ -2,10 +2,9 @@
 #include <ldns/ldns.h>
 
 int
-main(int argc, char **argv)
+main()
 {
        ldns_pkt *packet;
-       char *str;
        
        printf("test 5\n");
        
@@ -13,9 +12,8 @@ main(int argc, char **argv)
                                    LDNS_RR_TYPE_A,
                                    LDNS_RR_CLASS_IN);
 
-       str = ldns_pkt2str(packet);
-       
-       printf("packet:\n%s\n\n", str);
+       printf("Packet:\n");
+       ldns_pkt_print(stdout, packet);
        
        
        return 0;