Changeset 1002 for branches/client-3.0/src/ndpsmb.c

Timestamp:

Dec 30, 2016, 5:22:31 AM (9 years ago)

Author:

Paul Smedley

Message:

Simplify NdpFileRead code

File:

• branches/client-3.0/src/ndpsmb.c (modified) (3 diffs)

branches/client-3.0/src/ndpsmb.c

@@ -2218 +2218 @@
 }
 
-#define NDPSMB_READ_MAX_SIZE (65536 - 4096)
-//TODO simplify this code
 int APIENTRY NdpFileRead (HCONNECTION conn, NDFILEHANDLE handle, void *pBuffer, ULONG ulRead, ULONG *pulActual)
 {
@@ -2225 +2223 @@
         Resource *pRes = pConn->pRes;
         int rc = 0;
-        unsigned long done = 0;
-        unsigned long onedone;
-        unsigned long action;
-        ULONG ulReadCompleted = 0;
-
-        ENTER();
-
-        debuglocal(9,"NdpFileRead in [%p]\n", pConn);
-
-        do {
-                if (pConn->file.fd < 0)
-                {
-                        rc = ERROR_INVALID_HANDLE;
-                        break;
-                }
-                while (ulReadCompleted < ulRead)
-                {
-                        ULONG ulActual;
-                        ULONG ulToRead = ulRead - ulReadCompleted;
-                        debuglocal(9,"NdpFileRead completed %d, to read %d\n", ulReadCompleted, ulToRead);
-                        if (ulToRead > NDPSMB_READ_MAX_SIZE)
-                        {
-                                ulToRead = NDPSMB_READ_MAX_SIZE;
-                        }
-                        rc = smbwrp_read(pConn->cli, &pConn->file, (char *)pBuffer + ulReadCompleted, ulToRead, &ulActual);
-                        if (ulActual == 0 || rc != NO_ERROR)
-                        {
-                                break;
-                        }
-                        ulReadCompleted += ulActual;
-                }
-                //*pulActual = ulRead;
-                //DosSleep(0);
-
-        } while (0);
-
-        if (ulReadCompleted > 0)
+
+        ENTER();
+
+        debuglocal(9,"NdpFileRead in [%p], ulRead = %d\n", pConn, ulRead);
+
+        ULONG ulActual;
+        rc = smbwrp_read(pConn->cli, &pConn->file, (char *)pBuffer, ulRead, &ulActual);
+
+        if (ulActual > 0)
         {
                 rc = NO_ERROR; /* Still were able to read some data. */
@@ -2268 +2238 @@
         if (rc == NO_ERROR)
         {
-                *pulActual = ulReadCompleted;
+                *pulActual = ulActual;
         }