set initial buffer sizes to something sane

diff --git a/host2str.c b/host2str.c
index db227831480f814b1953fd33b5adc051a1965aa1..41884f8d49a2617b47ba2fb7971d49aab38afea1 100644 (file)
--- a/host2str.c
+++ b/host2str.c
@@ -1077,8 +1077,7 @@ char *
 ldns_rdf2str(ldns_rdf *rdf)
 {
        char *result = NULL;
-       /* XXX buffersize!!! */
-       ldns_buffer *tmp_buffer = ldns_buffer_new(1000);
+       ldns_buffer *tmp_buffer = ldns_buffer_new(MIN_BUFLEN);
 
        if (ldns_rdf2buffer_str(tmp_buffer, rdf) == LDNS_STATUS_OK) {
                /* export and return string, destroy rest */
@@ -1093,8 +1092,7 @@ char *
 ldns_rr2str(ldns_rr *rr)
 {
        char *result = NULL;
-       /* XXX MACTEXTSTR???? */
-       ldns_buffer *tmp_buffer = ldns_buffer_new(1000);
+       ldns_buffer *tmp_buffer = ldns_buffer_new(MIN_BUFLEN);
 
        if (ldns_rr2buffer_str(tmp_buffer, rr) == LDNS_STATUS_OK) {
                /* export and return string, destroy rest */
@@ -1109,7 +1107,7 @@ char *
 ldns_pkt2str(ldns_pkt *pkt)
 {
        char *result = NULL;
-       ldns_buffer *tmp_buffer = ldns_buffer_new(MAX_PACKETLEN);
+       ldns_buffer *tmp_buffer = ldns_buffer_new(MIN_BUFLEN);
 
        if (ldns_pkt2buffer_str(tmp_buffer, pkt) == LDNS_STATUS_OK) {
                /* export and return string, destroy rest */
@@ -1124,7 +1122,7 @@ char *
 ldns_rr_list2str(ldns_rr_list *list)
 {
        char *result = NULL;
-       ldns_buffer *tmp_buffer = ldns_buffer_new(MAX_PACKETLEN); /* XXX len? */
+       ldns_buffer *tmp_buffer = ldns_buffer_new(MIN_BUFLEN); 
 
        if (ldns_rr_list2buffer_str(tmp_buffer, list) == LDNS_STATUS_OK) {
                /* export and return string, destroy rest */

diff --git a/ldns/buffer.h b/ldns/buffer.h
index 993b02b6f51648c47561bdaaf389a5b703dc46a4..f316e4f3dc9cc6282071d4e79e70b30743ea1bb8 100644 (file)
--- a/ldns/buffer.h
+++ b/ldns/buffer.h
@@ -21,6 +21,11 @@
 
 #include "util.h"
 
+/* number of initial bytes in buffer of
+ * which we cannot tell the size before hand
+ */
+#define MIN_BUFLEN     256
+
 typedef struct buffer ldns_buffer;
 
 struct buffer