path: root/stream/stream.h
diff options
authorwm4 <wm4@nowhere>2013-07-12 22:07:07 +0200
committerwm4 <wm4@nowhere>2013-07-12 22:16:26 +0200
commitf63193f58f7214ef3a4f82be045f8a3cfd14b8ac (patch)
tree77bc53b7125730af961fb8b9298ef00f128d6576 /stream/stream.h
parentb66c609b4826059d348f6e1c049a34cc43415383 (diff)
stream: remove fd member
Stream implementations could set this to a unix file descriptor. The generic stream code could use it as fallback for a few things. This was confusing and insane. In most cases, the stream implementations defined all callbacks, so setting the fd member didn't have any advantages, other than avoiding defining a private struct to store it. It appears that even if the stream implementation used close() on the fd (or something equivalent), stream.c would close() it a second time (and on windows, even would call closesocket()), which should be proof for the insanity of this code. For stream_file.c, additionally make sure we don't close stdin or stdout if "-" is used as filename. For stream_vcd.c, remove the control() code. This code most likely didn't make the slightest sense, because it used a different type for stream->priv. It also leaked memory. Maybe it worked, but it's incorrect and insignificant anyway, so kill it. This code was added with commit 9521c19 (svn commit 31019). Untested for all protocols other than stream_file.c.
Diffstat (limited to 'stream/stream.h')
1 files changed, 0 insertions, 1 deletions
diff --git a/stream/stream.h b/stream/stream.h
index b80f31c44f..36adea2c40 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -134,7 +134,6 @@ typedef struct stream {
// Close
void (*close)(struct stream *s);
- int fd; // file descriptor, see man open(2)
enum streamtype type; // see STREAMTYPE_*
enum streamtype uncached_type; // if stream is cache, type of wrapped str.
int flags; // MP_STREAM_SEEK_* or'ed flags