diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | libio/fmemopen.c | 11 |
2 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,7 @@ +2011-03-04 Ulrich Drepper <drepper@gmail.com> + + * libio/fmemopen.c (fmemopen): Optimize a bit. + 2011-03-03 Andreas Schwab <schwab@redhat.com> * libio/fmemopen.c (fmemopen): Don't read past end of buffer. diff --git a/libio/fmemopen.c b/libio/fmemopen.c index 1a631d5122..75f9f7e5f6 100644 --- a/libio/fmemopen.c +++ b/libio/fmemopen.c @@ -226,6 +226,7 @@ fmemopen (void *buf, size_t len, const char *mode) return NULL; } c->buffer[0] = '\0'; + c->maxpos = 0; } else { @@ -236,14 +237,14 @@ fmemopen (void *buf, size_t len, const char *mode) } c->buffer = buf; - } - c->size = len; + if (mode[0] == 'w') + c->buffer[0] = '\0'; - if (mode[0] == 'w') - c->buffer[0] = '\0'; + c->maxpos = strnlen (c->buffer, len); + } - c->maxpos = strnlen (c->buffer, len); + c->size = len; if (mode[0] == 'a') c->pos = c->maxpos; |