naett.c

commit ed74483cfd806e21859488a1d237198bacb75325
parent 6cf5c98cd92ead7e7e5443ee7eb1c7c37b0e31b5
Author: Henrik Rydgård <hrydgard@gmail.com>
Date:   Mon, 31 Jul 2023 12:22:27 +0200

Try reverting the min thing

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

2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/naett_internal.h b/src/naett_internal.h
@@ -3,13 +3,13 @@
 
 #ifdef _MSC_VER
     #define strcasecmp _stricmp
+    #define min(a,b) (((a)<(b))?(a):(b))
     #undef strdup
     #define strdup _strdup
 #endif
 
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
-#define NOMINMAX
 #include <windows.h>
 #include <winhttp.h>
 #define __WINDOWS__ 1
diff --git a/src/naett_win.c b/src/naett_win.c
@@ -144,10 +144,7 @@ static void CALLBACK callback(HINTERNET request,
                 break;
             }
 
-            size_t bytesToRead = res->bytesLeft;
-            if (bytesToRead > sizeof(res->buffer)) {
-                bytesToRead = sizeof(res->buffer);
-            }
+            size_t bytesToRead = min(res->bytesLeft, sizeof(res->buffer));
             if (!WinHttpReadData(request, res->buffer, (DWORD)bytesToRead, NULL)) {
                 res->code = naettReadError;
                 res->complete = 1;
@@ -165,10 +162,7 @@ static void CALLBACK callback(HINTERNET request,
             res->totalBytesRead += (int)bytesRead;
             res->bytesLeft -= bytesRead;
             if (res->bytesLeft > 0) {
-                size_t bytesToRead = res->bytesLeft;
-                if (bytesToRead > sizeof(res->buffer)) {
-                    bytesToRead = sizeof(res->buffer);
-                }
+                size_t bytesToRead = min(res->bytesLeft, sizeof(res->buffer));
                 if (!WinHttpReadData(request, res->buffer, (DWORD)bytesToRead, NULL)) {
                     res->code = naettReadError;
                     res->complete = 1;