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

rename H_MAKE to H_ALLOC

Browse source
This commit is contained in:
Sven M. Hallberg 2013-01-23 18:17:17 +01:00
parent dc037e6c28
commit ef17e42ec8
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
examples/dns.c
View file

@ -102,14 +102,14 @@ const HParsedToken* act_header(const HParseResult *p) {
.additional_count = fields[11]->uint .additional_count = fields[11]->uint
}; };
dns_header_t *header = H_MAKE(dns_header_t); dns_header_t *header = H_ALLOC(dns_header_t);
*header = header_; *header = header_;
return H_MAKE_TOKEN(dns_header_t, header); return H_MAKE_TOKEN(dns_header_t, header);
} }
const HParsedToken* act_label(const HParseResult *p) { const HParsedToken* act_label(const HParseResult *p) {
dns_label_t *r = H_MAKE(dns_label_t); dns_label_t *r = H_ALLOC(dns_label_t);
r->len = p->ast->seq->used; r->len = p->ast->seq->used;
r->label = h_arena_malloc(p->arena, r->len + 1); r->label = h_arena_malloc(p->arena, r->len + 1);
@ -121,7 +121,7 @@ const HParsedToken* act_label(const HParseResult *p) {
} }
const HParsedToken* act_rr(const HParseResult *p) { const HParsedToken* act_rr(const HParseResult *p) {
dns_rr_t *rr = H_MAKE(dns_rr_t); dns_rr_t *rr = H_ALLOC(dns_rr_t);
rr->name = *H_FIELD(dns_domain_t, 0); rr->name = *H_FIELD(dns_domain_t, 0);
rr->type = p->ast->seq->elements[1]->uint; rr->type = p->ast->seq->elements[1]->uint;
@ -136,7 +136,7 @@ const HParsedToken* act_rr(const HParseResult *p) {
} }
const HParsedToken* act_question(const HParseResult *p) { const HParsedToken* act_question(const HParseResult *p) {
dns_question_t *q = H_MAKE(dns_question_t); dns_question_t *q = H_ALLOC(dns_question_t);
HParsedToken **fields = p->ast->seq->elements; HParsedToken **fields = p->ast->seq->elements;
// QNAME is a sequence of labels. Pack them into an array. // QNAME is a sequence of labels. Pack them into an array.
@ -154,7 +154,7 @@ const HParsedToken* act_question(const HParseResult *p) {
const HParsedToken* act_message(const HParseResult *p) { const HParsedToken* act_message(const HParseResult *p) {
h_pprint(stdout, p->ast, 0, 2); h_pprint(stdout, p->ast, 0, 2);
dns_message_t *msg = H_MAKE(dns_message_t); dns_message_t *msg = H_ALLOC(dns_message_t);
// Copy header into message struct. // Copy header into message struct.
dns_header_t *header = H_FIELD(dns_header_t, 0); dns_header_t *header = H_FIELD(dns_header_t, 0);

2
examples/dns_common.c
View file

@ -48,7 +48,7 @@ const HParsedToken* act_domain(const HParseResult *p) {
} }
if(arr) { if(arr) {
dns_domain_t *val = H_MAKE(dns_domain_t); // dns_domain_t is char* dns_domain_t *val = H_ALLOC(dns_domain_t); // dns_domain_t is char*
*val = arr; *val = arr;
ret = H_MAKE_TOKEN(dns_domain_t, val); ret = H_MAKE_TOKEN(dns_domain_t, val);
} }

2
examples/glue.h
View file

@ -48,7 +48,7 @@ const HParsedToken *h_act_flatten(const HParseResult *p);
HParsedToken *h_make_token(HArena *arena, HTokenType type, void *value); HParsedToken *h_make_token(HArena *arena, HTokenType type, void *value);
HParsedToken *h_make_token_seq(HArena *arena); HParsedToken *h_make_token_seq(HArena *arena);
#define H_MAKE(TYP) \ #define H_ALLOC(TYP) \
((TYP *) h_arena_malloc(p->arena, sizeof(TYP))) ((TYP *) h_arena_malloc(p->arena, sizeof(TYP)))
#define H_MAKE_TOKEN(TYP, VAL) \ #define H_MAKE_TOKEN(TYP, VAL) \

16
examples/rr.c
View file

@ -18,7 +18,7 @@ bool validate_null(HParseResult *p) {
} }
const HParsedToken *act_null(const HParseResult *p) { const HParsedToken *act_null(const HParseResult *p) {
dns_rr_null_t *null = H_MAKE(dns_rr_null_t); dns_rr_null_t *null = H_ALLOC(dns_rr_null_t);
size_t len = p->ast->seq->used; size_t len = p->ast->seq->used;
uint8_t *buf = h_arena_malloc(p->arena, sizeof(uint8_t)*len); uint8_t *buf = h_arena_malloc(p->arena, sizeof(uint8_t)*len);
@ -29,7 +29,7 @@ const HParsedToken *act_null(const HParseResult *p) {
} }
const HParsedToken *act_txt(const HParseResult *p) { const HParsedToken *act_txt(const HParseResult *p) {
dns_rr_txt_t *txt = H_MAKE(dns_rr_txt_t); dns_rr_txt_t *txt = H_ALLOC(dns_rr_txt_t);
const HCountedArray *arr = p->ast->seq; const HCountedArray *arr = p->ast->seq;
uint8_t **ret = h_arena_malloc(arr->arena, sizeof(uint8_t*)*arr->used); uint8_t **ret = h_arena_malloc(arr->arena, sizeof(uint8_t*)*arr->used);
@ -47,7 +47,7 @@ const HParsedToken *act_txt(const HParseResult *p) {
} }
const HParsedToken* act_cstr(const HParseResult *p) { const HParsedToken* act_cstr(const HParseResult *p) {
dns_cstr_t *cs = H_MAKE(dns_cstr_t); dns_cstr_t *cs = H_ALLOC(dns_cstr_t);
const HCountedArray *arr = p->ast->seq; const HCountedArray *arr = p->ast->seq;
uint8_t *ret = h_arena_malloc(arr->arena, sizeof(uint8_t)*arr->used); uint8_t *ret = h_arena_malloc(arr->arena, sizeof(uint8_t)*arr->used);
@ -60,7 +60,7 @@ const HParsedToken* act_cstr(const HParseResult *p) {
} }
const HParsedToken* act_soa(const HParseResult *p) { const HParsedToken* act_soa(const HParseResult *p) {
dns_rr_soa_t *soa = H_MAKE(dns_rr_soa_t); dns_rr_soa_t *soa = H_ALLOC(dns_rr_soa_t);
soa->mname = *H_FIELD(dns_domain_t, 0); soa->mname = *H_FIELD(dns_domain_t, 0);
soa->rname = *H_FIELD(dns_domain_t, 1); soa->rname = *H_FIELD(dns_domain_t, 1);
@ -74,7 +74,7 @@ const HParsedToken* act_soa(const HParseResult *p) {
} }
const HParsedToken* act_wks(const HParseResult *p) { const HParsedToken* act_wks(const HParseResult *p) {
dns_rr_wks_t *wks = H_MAKE(dns_rr_wks_t); dns_rr_wks_t *wks = H_ALLOC(dns_rr_wks_t);
wks->address = p->ast->seq->elements[0]->uint; wks->address = p->ast->seq->elements[0]->uint;
wks->protocol = p->ast->seq->elements[1]->uint; wks->protocol = p->ast->seq->elements[1]->uint;
@ -87,7 +87,7 @@ const HParsedToken* act_wks(const HParseResult *p) {
} }
const HParsedToken* act_hinfo(const HParseResult *p) { const HParsedToken* act_hinfo(const HParseResult *p) {
dns_rr_hinfo_t *hinfo = H_MAKE(dns_rr_hinfo_t); dns_rr_hinfo_t *hinfo = H_ALLOC(dns_rr_hinfo_t);
hinfo->cpu = *H_FIELD(dns_cstr_t, 0); hinfo->cpu = *H_FIELD(dns_cstr_t, 0);
hinfo->os = *H_FIELD(dns_cstr_t, 1); hinfo->os = *H_FIELD(dns_cstr_t, 1);
@ -96,7 +96,7 @@ const HParsedToken* act_hinfo(const HParseResult *p) {
} }
const HParsedToken* act_minfo(const HParseResult *p) { const HParsedToken* act_minfo(const HParseResult *p) {
dns_rr_minfo_t *minfo = H_MAKE(dns_rr_minfo_t); dns_rr_minfo_t *minfo = H_ALLOC(dns_rr_minfo_t);
minfo->rmailbx = *H_FIELD(dns_domain_t, 0); minfo->rmailbx = *H_FIELD(dns_domain_t, 0);
minfo->emailbx = *H_FIELD(dns_domain_t, 1); minfo->emailbx = *H_FIELD(dns_domain_t, 1);
@ -105,7 +105,7 @@ const HParsedToken* act_minfo(const HParseResult *p) {
} }
const HParsedToken* act_mx(const HParseResult *p) { const HParsedToken* act_mx(const HParseResult *p) {
dns_rr_mx_t *mx = H_MAKE(dns_rr_mx_t); dns_rr_mx_t *mx = H_ALLOC(dns_rr_mx_t);
mx->preference = p->ast->seq->elements[0]->uint; mx->preference = p->ast->seq->elements[0]->uint;
mx->exchange = *H_FIELD(dns_domain_t, 1); mx->exchange = *H_FIELD(dns_domain_t, 1);