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

Move capn_init_* all into capn-malloc.c with a common create and free function

Browse source
This commit is contained in:
James McKaskill 2013-05-08 22:35:52 -04:00
parent c5e771dcd0
commit f99af86cb3
5 changed files with 132 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

115
capn-stream.c
View file

@ -1,9 +1,6 @@
/* vim: set sw=8 ts=8 sts=8 noet: */
#include "capn.h"
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <limits.h>
#ifndef min
static int min(int a, int b) { return (a < b) ? a : b; }
@ -191,115 +188,3 @@ int capn_inflate(struct capn_stream* s) {
return 0;
}
#define ZBUF_SZ 4096
static int read_fp(void *p, size_t sz, FILE *f, struct capn_stream *z, uint8_t* zbuf, int packed) {
if (f && packed) {
z->next_out = (uint8_t*) p;
z->avail_out = sz;
while (z->avail_out && capn_inflate(z) == CAPN_NEED_MORE) {
int r;
memmove(zbuf, z->next_in, z->avail_in);
r = fread(zbuf+z->avail_in, 1, ZBUF_SZ - z->avail_in, f);
if (r <= 0)
return -1;
z->avail_in += r;
}
return 0;
} else if (f && !packed) {
return fread(p, sz, 1, f) != 1;
} else if (packed) {
z->next_out = (uint8_t*) p;
z->avail_out = sz;
return capn_inflate(z) != 0;
} else {
if (z->avail_in < sz)
return -1;
memcpy(p, z->next_in, sz);
z->next_in += sz;
z->avail_in -= sz;
return 0;
}
}
static int init_fp(struct capn *c, FILE *f, struct capn_stream *z, int packed) {
struct capn_segment *s = NULL;
uint32_t i, segnum, total = 0;
uint32_t hdr[1024];
uint8_t zbuf[ZBUF_SZ];
char *data = NULL;
memset(c, 0, sizeof(*c));
if (read_fp(&segnum, 4, f, z, zbuf, packed))
goto err;
segnum = capn_flip32(segnum);
if (segnum > 1023)
goto err;
segnum++;
s = (struct capn_segment*) calloc(segnum, sizeof(*s));
if (!s)
goto err;
if (read_fp(hdr, 8 * (segnum/2) + 4, f, z, zbuf, packed))
goto err;
for (i = 0; i < segnum; i++) {
uint32_t n = capn_flip32(hdr[i]);
if (n > INT_MAX/8 || n > UINT32_MAX/8 || UINT32_MAX - total < n*8)
goto err;
s[i].cap = s[i].len = n * 8;
total += s[i].len;
}
data = (char*) calloc(1, total);
if (!data)
goto err;
if (read_fp(data, total, f, z, zbuf, packed))
goto err;
for (i = 0; i < segnum; i++) {
s[i].data = data;
data += s[i].len;
capn_append_segment(c, &s[i]);
}
return 0;
err:
memset(c, 0, sizeof(*c));
free(data);
free(s);
return -1;
}
int capn_init_fp(struct capn *c, FILE *f, int packed) {
struct capn_stream z;
memset(&z, 0, sizeof(z));
return init_fp(c, f, &z, packed);
}
int capn_init_mem(struct capn *c, const uint8_t *p, size_t sz, int packed) {
struct capn_stream z;
memset(&z, 0, sizeof(z));
z.next_in = p;
z.avail_in = sz;
return init_fp(c, NULL, &z, packed);
}
void capn_free_mem(struct capn *c) {
capn_free_fp(c);
}
void capn_free_fp(struct capn *c) {
if (c->seglist) {
free(c->seglist->data);
free(c->seglist);
}
}