clones/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2024-09-21 06:37:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

prettier parse code.

Browse Source 
git-svn-id: file:///svn/unbound/trunk@3073 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2014-02-06 11:19:28 +00:00
parent 7fe2a3924f
commit 3997b79936
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
ldns/str2wire.c
View File

@ -585,6 +585,29 @@ sldns_parse_rdf_token(sldns_buffer* strbuf, char* token, size_t token_len,
return 1;
}
/** Add space and one more rdf token onto the existing token string. */
static int
sldns_affix_token(sldns_buffer* strbuf, char* token, size_t* token_len,
int* quoted, int* parens, int* tokquote, size_t* pre_data_pos,
const char* delimiters, sldns_rdf_type rdftype, size_t* token_strlen)
{
size_t addlen = *token_len - *token_strlen;
size_t addstrlen = 0;
/* add space */
if(addlen < 1) return 0;
token[*token_strlen] = ' ';
token[++(*token_strlen)] = 0;
/* read another token */
addlen = *token_len - *token_strlen;
if(!sldns_parse_rdf_token(strbuf, token+*token_strlen, addlen, quoted,
parens, tokquote, pre_data_pos, delimiters, rdftype,
&addstrlen))
return 0;
(*token_strlen) += addstrlen;
return 1;
}
/** parse rdata from string into rr buffer(-remainder after dname). */
static int
@ -634,34 +657,16 @@ rrinternal_parse_rdata(sldns_buffer* strbuf, char* token, size_t token_len,
} else if(token_strlen > 0 || quoted) {
if(rdftype == LDNS_RDF_TYPE_HIP) {
/* affix the HIT and PK fields, with a space */
size_t addlen = token_len - token_strlen;
size_t addstrlen = 0;
/* add space */
if(addlen < 1) break;
token[token_strlen] = ' ';
token[++token_strlen] = 0;
/* read another token */
addlen = token_len - token_strlen;
if(!sldns_parse_rdf_token(strbuf,
token+token_strlen, addlen, &quoted,
&parens, &tokquote, &pre_data_pos,
delimiters, rdftype, &addstrlen))
if(!sldns_affix_token(strbuf, token,
&token_len, &quoted, &parens,
&tokquote, &pre_data_pos, delimiters,
rdftype, &token_strlen))
break;
token_strlen += addstrlen;
/* add space */
addlen = token_len - token_strlen;
if(addlen < 1) break;
token[token_strlen] = ' ';
token[++token_strlen] = 0;
/* read another token */
addlen = token_len - token_strlen;
addstrlen = 0;
if(!sldns_parse_rdf_token(strbuf,
token+token_strlen, addlen, &quoted,
&parens, &tokquote, &pre_data_pos,
delimiters, rdftype, &addstrlen))
if(!sldns_affix_token(strbuf, token,
&token_len, &quoted, &parens,
&tokquote, &pre_data_pos, delimiters,
rdftype, &token_strlen))
break;
token_strlen += addstrlen;
}
/* normal RR */