From b0bd0a6e6b96c947ca2594463a1be9aea1a52a06 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 17 Apr 2015 23:04:11 +0200
Subject: stream_file: minor simplification

Now all this platform-specific code doesn't depend on stream or
stream_file internals anymore.
---
 stream/stream_file.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'stream/stream_file.c')

diff --git a/stream/stream_file.c b/stream/stream_file.c
index 83d90b902b..d0da8629bc 100644
--- a/stream/stream_file.c
+++ b/stream/stream_file.c
@@ -155,12 +155,11 @@ char *mp_file_get_path(void *talloc_ctx, bstr url)
 }
 
 #if HAVE_BSD_FSTATFS
-static bool check_stream_network(stream_t *stream)
+static bool check_stream_network(int fd)
 {
     struct statfs fs;
     const char *stypes[] = { "afpfs", "nfs", "smbfs", "webdav", NULL };
-    struct priv *priv = stream->priv;
-    if (fstatfs(priv->fd, &fs) == 0)
+    if (fstatfs(fd, &fs) == 0)
         for (int i=0; stypes[i]; i++)
             if (strcmp(stypes[i], fs.f_fstypename) == 0)
                 return true;
@@ -168,7 +167,7 @@ static bool check_stream_network(stream_t *stream)
 
 }
 #elif HAVE_LINUX_FSTATFS
-static bool check_stream_network(stream_t *stream)
+static bool check_stream_network(int fd)
 {
     struct statfs fs;
     const uint32_t stypes[] = {
@@ -181,8 +180,7 @@ static bool check_stream_network(stream_t *stream)
         0xBEEFDEAD  /*SNFS*/,   0xBACBACBC  /*VMHGFS*/, 0x7461636f  /*OCFS2*/,
         0
     };
-    struct priv *priv = stream->priv;
-    if (fstatfs(priv->fd, &fs) == 0) {
+    if (fstatfs(fd, &fs) == 0) {
         for (int i=0; stypes[i]; i++) {
             if (stypes[i] == fs.f_type)
                 return true;
@@ -192,7 +190,7 @@ static bool check_stream_network(stream_t *stream)
 
 }
 #elif defined(_WIN32)
-static bool check_stream_network(stream_t *stream)
+static bool check_stream_network(int fd)
 {
     NTSTATUS (NTAPI *pNtQueryVolumeInformationFile)(HANDLE,
         PIO_STATUS_BLOCK, PVOID, ULONG, FS_INFORMATION_CLASS) = NULL;
@@ -208,8 +206,7 @@ static bool check_stream_network(stream_t *stream)
     if (!pNtQueryVolumeInformationFile)
         return false;
 
-    struct priv *priv = stream->priv;
-    HANDLE h = (HANDLE)_get_osfhandle(priv->fd);
+    HANDLE h = (HANDLE)_get_osfhandle(fd);
     if (h == INVALID_HANDLE_VALUE)
         return false;
 
@@ -224,7 +221,7 @@ static bool check_stream_network(stream_t *stream)
            (info.Characteristics & FILE_REMOTE_DEVICE);
 }
 #else
-static bool check_stream_network(stream_t *stream)
+static bool check_stream_network(int fd)
 {
     return false;
 }
@@ -310,7 +307,7 @@ static int open_f(stream_t *stream)
     stream->read_chunk = 64 * 1024;
     stream->close = s_close;
 
-    if (check_stream_network(stream))
+    if (check_stream_network(fd))
         stream->streaming = true;
 
     return STREAM_OK;
-- 
cgit v1.2.3