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

use create_local

Browse source
This commit is contained in:
James McKaskill 2013-09-12 14:42:30 -04:00
parent ca1d07f657
commit 448021e7e1
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
capn-malloc.c
View file

@ -23,9 +23,14 @@ static struct capn_segment *create(void *u, uint32_t id, int sz) {
return s; return s;
} }
static struct capn_segment *create_local(void *u, int sz) {
return create(u, 0, sz);
}
void capn_init_malloc(struct capn *c) { void capn_init_malloc(struct capn *c) {
memset(c, 0, sizeof(*c)); memset(c, 0, sizeof(*c));
c->create = &create; c->create = &create;
c->create_local = &create_local;
} }
void capn_free(struct capn *c) { void capn_free(struct capn *c) {

2
capn.c
View file

@ -662,7 +662,7 @@ static int copy_ptr(struct capn_segment *seg, char *data, struct capn_ptr *t, st
/* need to allocate a struct copy */ /* need to allocate a struct copy */
if (!cs || cs->len + sizeof(*n) > cs->cap) { if (!cs || cs->len + sizeof(*n) > cs->cap) {
cs = c->create ? c->create(c->user, CAPN_SEGID_LOCAL, sizeof(*n)) : NULL; cs = c->create_local ? c->create_local(c->user, sizeof(*n)) : NULL;
if (!cs) { if (!cs) {
/* can't allocate a copy structure */ /* can't allocate a copy structure */
return -1; return -1;

4
capn.h
View file

@ -10,8 +10,6 @@
extern "C" { extern "C" {
#endif #endif
#define CAPN_SEGID_LOCAL 0xFFFFFFFF
#if defined(__cplusplus) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) #if defined(__cplusplus) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
#define CAPN_INLINE static inline #define CAPN_INLINE static inline
#else #else
@ -44,7 +42,7 @@ struct capn {
/* user settable */ /* user settable */
struct capn_segment *(*lookup)(void* /*user*/, uint32_t /*id */); struct capn_segment *(*lookup)(void* /*user*/, uint32_t /*id */);
struct capn_segment *(*create)(void* /*user*/, uint32_t /*id */, int /*sz*/); struct capn_segment *(*create)(void* /*user*/, uint32_t /*id */, int /*sz*/);
struct capn_segment *(*create_local)(void* /*user*/, uint32_t /*id */, int /*sz*/); struct capn_segment *(*create_local)(void* /*user*/, int /*sz*/);
void *user; void *user;
/* zero initialized, user should not modify */ /* zero initialized, user should not modify */
uint32_t segnum; uint32_t segnum;