From: Miek Gieben <miekg@NLnetLabs.nl>
Date: Wed, 6 Apr 2005 13:46:29 +0000 (+0000)
Subject: move ldns_unquote to ldns_rdf_new_frm_str. Not yet modified dname_new_frm_str yet... 
X-Git-Tag: release-0.50~160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=864b1ff644e7d1749d83f412beb46adafbf8c8f9;p=thirdparty%2Fldns.git

move ldns_unquote to ldns_rdf_new_frm_str. Not yet modified dname_new_frm_str yet, as it does labelize a string
---

diff --git a/rdata.c b/rdata.c
index e91d10a7..e9dd30d0 100644
--- a/rdata.c
+++ b/rdata.c
@@ -318,10 +318,13 @@ ldns_rdf_free(ldns_rdf *rd)
  * \return ldns_rdf*
  */
 ldns_rdf *
-ldns_rdf_new_frm_str(ldns_rdf_type type, const char *str)
+ldns_rdf_new_frm_str(ldns_rdf_type type, const char *str_in)
 {
 	ldns_rdf *rdf;
 	ldns_status status;
+	char *str;
+
+	(void)ldns_unquote(str_in, &str);
 
 	switch (type) {
 	case LDNS_RDF_TYPE_DNAME:
diff --git a/rr.c b/rr.c
index 882d9f65..aab63ae2 100644
--- a/rr.c
+++ b/rr.c
@@ -98,7 +98,6 @@ ldns_rr_new_frm_str(const char *str)
 	ldns_rr_type rr_type;
 	ldns_buffer *rr_buf;
 	ldns_buffer *rd_buf;
-	char  *unquoted;
 	char  *owner; 
 	char  *ttl; 
 	char  *clas;
@@ -107,13 +106,11 @@ ldns_rr_new_frm_str(const char *str)
 	char  *rd;
 	
 	ldns_rdf *r;
-	size_t  unquoted_len;
 	uint16_t r_cnt;
 	uint16_t r_min;
 	uint16_t r_max;
 
 	new = ldns_rr_new();
-	unquoted_len = ldns_unquote((char *)str, &unquoted);
 
 	owner = XMALLOC(char, MAX_DOMAINLEN + 1);
 	ttl = XMALLOC(char, 21);
@@ -125,7 +122,7 @@ ldns_rr_new_frm_str(const char *str)
 	rd = XMALLOC(char, MAX_RDFLEN);
 	r_cnt = 0;
 
-	ldns_buffer_new_frm_data(rr_buf, unquoted, unquoted_len);
+	ldns_buffer_new_frm_data(rr_buf, str, strlen(str));
 	
 	/* split the rr in its parts -1 signal trouble */
 	if (ldns_bget_token(rr_buf, owner, "\t ", MAX_DOMAINLEN) == -1) {