Browse Source

optimize seek function for memory streams

Rich Felker 13 years ago
parent
commit
c88f36f556
2 changed files with 6 additions and 24 deletions
  1. 3 12
      src/stdio/open_memstream.c
  2. 3 12
      src/stdio/open_wmemstream.c

+ 3 - 12
src/stdio/open_memstream.c

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

+ 3 - 12
src/stdio/open_wmemstream.c

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