summaryrefslogtreecommitdiff
path: root/libio/memstream.c
diff options
context:
space:
mode:
Diffstat (limited to 'libio/memstream.c')
-rw-r--r--libio/memstream.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/libio/memstream.c b/libio/memstream.c
index 4cc9ab2dfc..742da740ef 100644
--- a/libio/memstream.c
+++ b/libio/memstream.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-97,99,2000,2002,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1995-97,99,2000,2002-2004,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -106,11 +106,6 @@ _IO_mem_sync (fp)
_IO_FILE* fp;
{
struct _IO_FILE_memstream *mp = (struct _IO_FILE_memstream *) fp;
- int res;
-
- res = _IO_default_sync (fp);
- if (res < 0)
- return res;
if (fp->_IO_write_ptr == fp->_IO_write_end)
{
@@ -140,9 +135,9 @@ _IO_mem_finish (fp, dummy)
{
(*mp->bufloc)[fp->_IO_write_ptr - fp->_IO_write_base] = '\0';
*mp->sizeloc = fp->_IO_write_ptr - fp->_IO_write_base;
- }
- fp->_IO_buf_base = NULL;
+ fp->_IO_buf_base = NULL;
+ }
- INTUSE(_IO_default_finish) (fp, 0);
+ _IO_str_finish (fp, 0);
}