Browse Source

optimize seek function for memory streams

rs-1.0
Rich Felker 15 years ago
parent
commit
c88f36f556
  1. 13
      src/stdio/open_memstream.c
  2. 13
      src/stdio/open_wmemstream.c

13
src/stdio/open_memstream.c

@ -13,21 +13,12 @@ static off_t ms_seek(FILE *f, off_t off, int whence)
{ {
ssize_t base; ssize_t base;
struct cookie *c = f->cookie; struct cookie *c = f->cookie;
switch (whence) { if (whence>2U) {
case SEEK_SET:
base = 0;
break;
case SEEK_CUR:
base = c->pos;
break;
case SEEK_END:
base = c->len;
break;
default:
fail: fail:
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
base = (size_t [3]){0, c->pos, c->len}[whence];
if (off < -base || off > SSIZE_MAX-base) goto fail; if (off < -base || off > SSIZE_MAX-base) goto fail;
return c->pos = base+off; return c->pos = base+off;
} }

13
src/stdio/open_wmemstream.c

@ -14,21 +14,12 @@ static off_t wms_seek(FILE *f, off_t off, int whence)
{ {
ssize_t base; ssize_t base;
struct cookie *c = f->cookie; struct cookie *c = f->cookie;
switch (whence) { if (whence>2U) {
case SEEK_SET:
base = 0;
break;
case SEEK_CUR:
base = c->pos;
break;
case SEEK_END:
base = c->len;
break;
default:
fail: fail:
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
base = (size_t [3]){0, c->pos, c->len}[whence];
if (off < -base || off > SSIZE_MAX/4-base) goto fail; if (off < -base || off > SSIZE_MAX/4-base) goto fail;
memset(&c->mbs, 0, sizeof c->mbs); memset(&c->mbs, 0, sizeof c->mbs);
return c->pos = base+off; return c->pos = base+off;

Loading…
Cancel
Save