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

clean up of write_ptr

Browse source
This commit is contained in:
James McKaskill 2013-12-10 20:34:04 -05:00
parent df3e668f79
commit 2c48f47b3d
1 changed files with 44 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

24
capn.c
View file

@ -413,6 +413,7 @@ void capn_resolve(capn_ptr *p) {
}
}
/* TODO: should this handle CAPN_BIT_LIST? */
capn_ptr capn_getp(capn_ptr p, int off, int resolve) {
capn_ptr ret = {CAPN_FAR_POINTER};
ret.seg = p.seg;
@ -477,16 +478,22 @@ static void write_ptr_tag(char *d, capn_ptr p, int off) {
} else {
val |= LIST_PTR | (U64(p.len) << 35);
if (p.datasz == 8) {
switch (p.datasz) {
case 8:
val |= (U64(BYTE_8_LIST) << 32);
} else if (p.datasz == 4) {
break;
case 4:
val |= (U64(BYTE_4_LIST) << 32);
} else if (p.datasz == 2) {
break;
case 2:
val |= (U64(BYTE_2_LIST) << 32);
} else if (p.datasz == 1) {
break;
case 1:
val |= (U64(BYTE_1_LIST) << 32);
} else {
break;
case 0:
val |= (U64(VOID_LIST) << 32);
break;
}
}
break;
@ -532,10 +539,7 @@ static int write_ptr(struct capn_segment *s, char *d, capn_ptr p) {
write_ptr_tag(d, p, pdata - d - 8);
return 0;
} else {
/* if its in the same context we can create a far pointer */
if (p.has_ptr_tag) {
} else if (p.has_ptr_tag) {
/* By lucky chance, the data has a tag in front
* of it. This happens when new_object had to move
* the data to a new segment. */
@ -572,7 +576,6 @@ static int write_ptr(struct capn_segment *s, char *d, capn_ptr p) {
return 0;
}
}
}
struct copy {
struct capn_tree hdr;
@ -756,6 +759,7 @@ static void copy_list_member(capn_ptr* t, capn_ptr *f, int *dep) {
#define MAX_COPY_DEPTH 32
/* TODO: handle CAPN_BIT_LIST and setting from an inner bit list member */
int capn_setp(capn_ptr p, int off, capn_ptr tgt) {
struct capn_ptr to[MAX_COPY_DEPTH], from[MAX_COPY_DEPTH];
char *data;