rshen/c-capnproto
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lib: fix warning on uint16->enum cast

Browse source
This commit is contained in:
David Lamparter 2016-03-18 23:23:39 +01:00
parent 332076e522
commit 41462901df
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/capnpc-c.c
View file

@ -595,7 +595,7 @@ static void get_member(struct str *func, struct field *f, const char *ptr, const
str_addf(func, "%s = capn_to_f64(capn_read64(%s, %d)%s);\n", var, ptr, 8*f->f.slot.offset, xor); str_addf(func, "%s = capn_to_f64(capn_read64(%s, %d)%s);\n", var, ptr, 8*f->f.slot.offset, xor);
return; return;
case Type__enum: case Type__enum:
str_addf(func, "%s = (%s) capn_read16(%s, %d)%s;\n", var, f->v.tname, ptr, 2*f->f.slot.offset, xor); str_addf(func, "%s = (%s)(int) capn_read16(%s, %d)%s;\n", var, f->v.tname, ptr, 2*f->f.slot.offset, xor);
return; return;
case Type_text: case Type_text:
if (!f->v.intval) if (!f->v.intval)
@ -737,13 +737,13 @@ static void do_union(struct strings *s, struct node *n, struct field *first_fiel
str_addf(&tag, "%.*s_which", s->var.len - 1, s->var.str); str_addf(&tag, "%.*s_which", s->var.len - 1, s->var.str);
str_addf(&enums, "enum %s_which {", n->name.str); str_addf(&enums, "enum %s_which {", n->name.str);
str_addf(&s->decl, "%senum %s_which %s_which;\n", s->dtab.str, n->name.str, union_name); str_addf(&s->decl, "%senum %s_which %s_which;\n", s->dtab.str, n->name.str, union_name);
str_addf(&s->get, "%s%s = (enum %s_which) capn_read16(p.p, %d);\n", str_addf(&s->get, "%s%s = (enum %s_which)(int) capn_read16(p.p, %d);\n",
s->ftab.str, tag.str, n->name.str, tagoff); s->ftab.str, tag.str, n->name.str, tagoff);
} else { } else {
str_addf(&tag, "%swhich", s->var.str); str_addf(&tag, "%swhich", s->var.str);
str_addf(&enums, "enum %s_which {", n->name.str); str_addf(&enums, "enum %s_which {", n->name.str);
str_addf(&s->decl, "%senum %s_which which;\n", s->dtab.str, n->name.str); str_addf(&s->decl, "%senum %s_which which;\n", s->dtab.str, n->name.str);
str_addf(&s->get, "%s%s = (enum %s_which) capn_read16(p.p, %d);\n", str_addf(&s->get, "%s%s = (enum %s_which)(int) capn_read16(p.p, %d);\n",
s->ftab.str, tag.str, n->name.str, tagoff); s->ftab.str, tag.str, n->name.str, tagoff);
} }