fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-04-25 15:22:15 +00:00
Code Issues Projects Releases Wiki Activity

clean up allocation/setup logic for open_[w]memstream

Browse Source 
bring these functions up to date with the current idioms we use/prefer
in fmemopen and fopencookie.
This commit is contained in:
Rich Felker 2018-04-18 15:08:16 -04:00
parent 0b043c7b70
commit 6019459251
2 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/stdio/open_memstream.c
View File

@ -12,6 +12,12 @@ struct cookie {
size_t space; size_t space;
}; };
struct ms_FILE {
FILE f;
struct cookie c;
unsigned char buf[BUFSIZ];
};
static off_t ms_seek(FILE *f, off_t off, int whence) static off_t ms_seek(FILE *f, off_t off, int whence)
{ {
ssize_t base; ssize_t base;
@ -57,34 +63,34 @@ static int ms_close(FILE *f)
FILE *open_memstream(char **bufp, size_t *sizep) FILE *open_memstream(char **bufp, size_t *sizep)
{ {
FILE *f; struct ms_FILE *f;
struct cookie *c;
char *buf; char *buf;
if (!(f=malloc(sizeof *f + sizeof *c + BUFSIZ))) return 0; if (!(f=malloc(sizeof *f))) return 0;
if (!(buf=malloc(sizeof *buf))) { if (!(buf=malloc(sizeof *buf))) {
free(f); free(f);
return 0; return 0;
} }
memset(f, 0, sizeof *f + sizeof *c); memset(&f->f, 0, sizeof f->f);
f->cookie = c = (void *)(f+1); memset(&f->c, 0, sizeof f->c);
f->f.cookie = &f->c;
c->bufp = bufp; f->c.bufp = bufp;
c->sizep = sizep; f->c.sizep = sizep;
c->pos = c->len = c->space = *sizep = 0; f->c.pos = f->c.len = f->c.space = *sizep = 0;
c->buf = *bufp = buf; f->c.buf = *bufp = buf;
*buf = 0; *buf = 0;
f->flags = F_NORD; f->f.flags = F_NORD;
f->fd = -1; f->f.fd = -1;
f->buf = (void *)(c+1); f->f.buf = f->buf;
f->buf_size = BUFSIZ; f->f.buf_size = sizeof f->buf;
f->lbf = EOF; f->f.lbf = EOF;
f->write = ms_write; f->f.write = ms_write;
f->seek = ms_seek; f->f.seek = ms_seek;
f->close = ms_close; f->f.close = ms_close;
if (!libc.threaded) f->lock = -1; if (!libc.threaded) f->f.lock = -1;
return __ofl_add(f); return __ofl_add(&f->f);
} }

44
src/stdio/open_wmemstream.c
View File

@ -14,6 +14,12 @@ struct cookie {
mbstate_t mbs; mbstate_t mbs;
}; };
struct wms_FILE {
FILE f;
struct cookie c;
unsigned char buf[1];
};
static off_t wms_seek(FILE *f, off_t off, int whence) static off_t wms_seek(FILE *f, off_t off, int whence)
{ {
ssize_t base; ssize_t base;
@ -59,34 +65,34 @@ static int wms_close(FILE *f)
FILE *open_wmemstream(wchar_t **bufp, size_t *sizep) FILE *open_wmemstream(wchar_t **bufp, size_t *sizep)
{ {
FILE *f; struct wms_FILE *f;
struct cookie *c;
wchar_t *buf; wchar_t *buf;
if (!(f=malloc(sizeof *f + sizeof *c))) return 0; if (!(f=malloc(sizeof *f))) return 0;
if (!(buf=malloc(sizeof *buf))) { if (!(buf=malloc(sizeof *buf))) {
free(f); free(f);
return 0; return 0;
} }
memset(f, 0, sizeof *f + sizeof *c); memset(&f->f, 0, sizeof f->f);
f->cookie = c = (void *)(f+1); memset(&f->c, 0, sizeof f->c);
f->f.cookie = &f->c;
c->bufp = bufp; f->c.bufp = bufp;
c->sizep = sizep; f->c.sizep = sizep;
c->pos = c->len = c->space = *sizep = 0; f->c.pos = f->c.len = f->c.space = *sizep = 0;
c->buf = *bufp = buf; f->c.buf = *bufp = buf;
*buf = 0; *buf = 0;
f->flags = F_NORD; f->f.flags = F_NORD;
f->fd = -1; f->f.fd = -1;
f->buf = (void *)(c+1); f->f.buf = f->buf;
f->buf_size = 0; f->f.buf_size = 0;
f->lbf = EOF; f->f.lbf = EOF;
f->write = wms_write; f->f.write = wms_write;
f->seek = wms_seek; f->f.seek = wms_seek;
f->close = wms_close; f->f.close = wms_close;
if (!libc.threaded) f->lock = -1; if (!libc.threaded) f->f.lock = -1;
return __ofl_add(f); return __ofl_add(&f->f);
} }