about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-06-19 00:05:35 -0400
committerRich Felker <dalias@aerifal.cx>2012-06-19 00:05:35 -0400
commit2499cd9d9be0ba74e16a6c3dd304e6d69070be35 (patch)
treeb369187c752376bfc4038e7f3116417a9173350f
parent26710be7148d51a954c4fe4acedab90d161e609a (diff)
downloadmusl-2499cd9d9be0ba74e16a6c3dd304e6d69070be35.tar.gz
musl-2499cd9d9be0ba74e16a6c3dd304e6d69070be35.tar.xz
musl-2499cd9d9be0ba74e16a6c3dd304e6d69070be35.zip
remove flush hook cruft that was never used from stdio
there is no need/use for a flush hook. the write function serves this
purpose already. i originally created the hook for implementing mem
streams based on a mistaken reading of posix, and later realized it
wasn't useful but never removed it until now.
-rw-r--r--src/internal/stdio_impl.h2
-rw-r--r--src/stdio/fflush.c3
-rw-r--r--src/stdio/freopen.c1
3 files changed, 1 insertions, 5 deletions
diff --git a/src/internal/stdio_impl.h b/src/internal/stdio_impl.h
index a1f31b3c..d54c918b 100644
--- a/src/internal/stdio_impl.h
+++ b/src/internal/stdio_impl.h
@@ -57,7 +57,7 @@ struct __FILE_s {
 	int waiters;
 	void *cookie;
 	off_t off;
-	int (*flush)(FILE *);
+	void *dummy4;
 	void *mustbezero_2;
 	unsigned char *shend;
 	off_t shlim, shcnt;
diff --git a/src/stdio/fflush.c b/src/stdio/fflush.c
index 4c1647b7..715c1d10 100644
--- a/src/stdio/fflush.c
+++ b/src/stdio/fflush.c
@@ -15,9 +15,6 @@ static int __fflush_unlocked(FILE *f)
 	f->wpos = f->wbase = f->wend = 0;
 	f->rpos = f->rend = 0;
 
-	/* Hook for special behavior on flush */
-	if (f->flush) f->flush(f);
-
 	return 0;
 }
 
diff --git a/src/stdio/freopen.c b/src/stdio/freopen.c
index 958dbd20..b1f8fe71 100644
--- a/src/stdio/freopen.c
+++ b/src/stdio/freopen.c
@@ -32,7 +32,6 @@ FILE *freopen(const char *filename, const char *mode, FILE *f)
 	f->write = f2->write;
 	f->seek = f2->seek;
 	f->close = f2->close;
-	f->flush = f2->flush;
 
 	fclose(f2);
 	return f;