naett.c

commit 23a849ec64626d174cff792b3d90c72410f5a79b
parent 29502cbae8b7a60a1ecb01acec2c13a0512e7e9f
Author: Henrik Rydgård <hrydgard@gmail.com>
Date:   Mon, 31 Jul 2023 11:56:33 +0200

Remove use of the min() function

Diffstat:
M
src/naett_win.c
 | 
10
++++++++--

1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/naett_win.c b/src/naett_win.c
@@ -144,7 +144,10 @@ static void CALLBACK callback(HINTERNET request,
                 break;
             }
 
-            size_t bytesToRead = min(res->bytesLeft, sizeof(res->buffer));
+            size_t bytesToRead = res->bytesLeft;
+            if (bytesToRead > sizeof(res->buffer)) {
+                bytesToRead = sizeof(res->buffer);
+            }
             if (!WinHttpReadData(request, res->buffer, (DWORD)bytesToRead, NULL)) {
                 res->code = naettReadError;
                 res->complete = 1;
@@ -162,7 +165,10 @@ static void CALLBACK callback(HINTERNET request,
             res->totalBytesRead += (int)bytesRead;
             res->bytesLeft -= bytesRead;
             if (res->bytesLeft > 0) {
-                size_t bytesToRead = min(res->bytesLeft, sizeof(res->buffer));
+                size_t bytesToRead = res->bytesLeft;
+                if (bytesToRead > sizeof(res->buffer)) {
+                    bytesToRead = sizeof(res->buffer);
+                }
                 if (!WinHttpReadData(request, res->buffer, (DWORD)bytesToRead, NULL)) {
                     res->code = naettReadError;
                     res->complete = 1;