minor cleanup in fopencookie

assign entire struct rather than member-at-a-time. don't repeat buffer
sizes; always use sizeof to ensure consistency.
This commit is contained in:
Rich Felker 2018-04-18 14:46:05 -04:00
parent c9f415d7ea
commit 4245a233c1

View File

@ -116,15 +116,12 @@ FILE *fopencookie(void *cookie, const char *mode, cookie_io_functions_t iofuncs)
/* Set up our fcookie */ /* Set up our fcookie */
f->fc.cookie = cookie; f->fc.cookie = cookie;
f->fc.iofuncs.read = iofuncs.read; f->fc.iofuncs = iofuncs;
f->fc.iofuncs.write = iofuncs.write;
f->fc.iofuncs.seek = iofuncs.seek;
f->fc.iofuncs.close = iofuncs.close;
f->f.fd = -1; f->f.fd = -1;
f->f.cookie = &f->fc; f->f.cookie = &f->fc;
f->f.buf = f->buf + UNGET; f->f.buf = f->buf + UNGET;
f->f.buf_size = BUFSIZ; f->f.buf_size = sizeof f->buf - UNGET;
f->f.lbf = EOF; f->f.lbf = EOF;
/* Initialize op ptrs. No problem if some are unneeded. */ /* Initialize op ptrs. No problem if some are unneeded. */