emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace remaining h_attr_bool calls with VRULEs

Browse source
This commit is contained in:
Sven M. Hallberg 2013-01-17 18:34:11 +01:00
parent dd574bd735
commit 954a762fc0
2 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
examples/dns_common.c
View file

@ -16,6 +16,8 @@ bool validate_label(HParseResult *p) {
return (64 > p->ast->seq->used); return (64 > p->ast->seq->used);
} }
#define act_label h_act_flatten
const HParsedToken* act_domain(const HParseResult *p) { const HParsedToken* act_domain(const HParseResult *p) {
const HParsedToken *ret = NULL; const HParsedToken *ret = NULL;
char *arr = NULL; char *arr = NULL;
@ -54,8 +56,6 @@ const HParsedToken* act_domain(const HParseResult *p) {
return ret; return ret;
} }
#define act_label_ h_act_flatten
const HParser* init_domain() { const HParser* init_domain() {
static const HParser *ret = NULL; static const HParser *ret = NULL;
if (ret) if (ret)
@ -64,14 +64,13 @@ const HParser* init_domain() {
H_RULE (letter, h_choice(h_ch_range('a','z'), h_ch_range('A','Z'), NULL)); H_RULE (letter, h_choice(h_ch_range('a','z'), h_ch_range('A','Z'), NULL));
H_RULE (let_dig, h_choice(letter, h_ch_range('0','9'), NULL)); H_RULE (let_dig, h_choice(letter, h_ch_range('0','9'), NULL));
H_RULE (ldh_str, h_many1(h_choice(let_dig, h_ch('-'), NULL))); H_RULE (ldh_str, h_many1(h_choice(let_dig, h_ch('-'), NULL)));
H_ARULE(label_, h_sequence(letter, H_VARULE(label, h_sequence(letter,
h_optional(h_sequence(h_optional(ldh_str), h_optional(h_sequence(h_optional(ldh_str),
let_dig, let_dig,
NULL)), NULL)),
NULL)); NULL));
H_RULE (label, h_attr_bool(label_, validate_label));
H_RULE (subdomain, h_sepBy1(label, h_ch('.'))); H_RULE (subdomain, h_sepBy1(label, h_ch('.')));
H_ARULE(domain, h_choice(subdomain, h_ch(' '), NULL)); H_ARULE (domain, h_choice(subdomain, h_ch(' '), NULL));
ret = domain; ret = domain;
return ret; return ret;

4
examples/rr.c
View file

@ -42,7 +42,7 @@ const HParser* init_rdata(uint16_t type) {
H_RULE (mb, domain); H_RULE (mb, domain);
H_RULE (mg, domain); H_RULE (mg, domain);
H_RULE (mr, domain); H_RULE (mr, domain);
H_RULE (null_, h_attr_bool(h_many(h_uint8()), validate_null)); H_VRULE(null, h_many(h_uint8()));
H_RULE (wks, h_sequence(h_uint32(), H_RULE (wks, h_sequence(h_uint32(),
h_uint8(), h_uint8(),
h_many(h_uint8()), h_many(h_uint8()),
@ -64,7 +64,7 @@ const HParser* init_rdata(uint16_t type) {
parsers[ 7] = mb; parsers[ 7] = mb;
parsers[ 8] = mg; parsers[ 8] = mg;
parsers[ 9] = mr; parsers[ 9] = mr;
parsers[10] = null_; parsers[10] = null;
parsers[11] = wks; parsers[11] = wks;
parsers[12] = ptr; parsers[12] = ptr;
parsers[13] = hinfo; parsers[13] = hinfo;