Merge branch 'fix/SDK-4220_Adapt-maxds-int64_t' into 'release/v7.7.0'

SDK-4220. Adapt maxds usage to its type int64_t  (release/v7.7.0)

See merge request sdk/sdk!5735

Author: alber2510

examples/megacli.cpp

@@ -9828,7 +9828,7 @@ dstime DemoApp::pread_failure(const Error &e, int retry, void* /*appdata*/, dsti
             delete pread_file;
             pread_file = NULL;
         }
-        return ~(dstime)0;
+        return NEVER;
     }
 }
 

include/mega/megaapp.h

@@ -222,7 +222,10 @@ struct MEGA_API MegaApp
     virtual void openfilelink_result(handle, const byte*, m_off_t, string*, string*, int) { }
 
     // pread result
-    virtual dstime pread_failure(const Error&, int, void*, dstime) { return ~(dstime)0; }
+    virtual dstime pread_failure(const Error&, int, void*, dstime)
+    {
+        return NEVER;
+    }
     virtual bool pread_data(byte*, m_off_t, m_off_t, m_off_t, m_off_t, void*) { return false; }
 
     // event reporting result

src/posix/waiter.cpp

@@ -85,8 +85,9 @@ bool PosixWaiter::fd_filter(int nfds, mega_fd_set_t* fds, mega_fd_set_t* ignoref
 }
 
 // wait for supplied events (sockets, filesystem changes), plus timeout + application events
-// maxds specifies the maximum amount of time to wait in deciseconds (or ~0 if no timeout scheduled)
-// returns application-specific bitmask. bit 0 set indicates that exec() needs to be called.
+// maxds specifies the maximum amount of time to wait in deciseconds (or
+// NEVER if no timeout scheduled) returns application-specific bitmask.
+// bit 0 set indicates that exec() needs to be called.
 int PosixWaiter::wait()
 {
     int numfd = 0;
@@ -97,7 +98,7 @@ int PosixWaiter::wait()
 
     bumpmaxfd(m_pipe[0]);
 
-    if (maxds + 1)
+    if (EVER(maxds))
     {
         dstime us = 1000000 / 10 * maxds;
 
@@ -108,8 +109,7 @@ int PosixWaiter::wait()
 #ifdef USE_POLL
     // wait infinite (-1) if maxds is max dstime OR it would overflow platform's int
     int timeoutInMs = -1;
-    if (maxds != std::numeric_limits<dstime>::max() &&
-        maxds <= std::numeric_limits<int>::max() / 100)
+    if (EVER(maxds) && maxds <= std::numeric_limits<int>::max() / 100)
     {
         timeoutInMs = static_cast<int>(maxds) * 100;
     }
@@ -139,7 +139,7 @@ int PosixWaiter::wait()
     }
     numfd = poll(fds, total, timeoutInMs);
 #else
-    numfd = select(maxfd + 1, &rfds, &wfds, &efds, maxds + 1 ? &tv : NULL);
+    numfd = select(maxfd + 1, &rfds, &wfds, &efds, EVER(maxds) ? &tv : NULL);
 #endif
 
     // empty pipe

src/win32/consolewaiter.cpp

@@ -41,8 +41,8 @@ WinConsoleWaiter::WinConsoleWaiter(WinConsole* con)
 }
 
 // wait for events (socket, I/O completion, timeout + application events)
-// ds specifies the maximum amount of time to wait in deciseconds (or ~0 if no
-// timeout scheduled)
+// ds specifies the maximum amount of time to wait in deciseconds (or
+// NEVER if no timeout scheduled)
 int WinConsoleWaiter::wait()
 {
     int r;

src/win32/waiter.cpp

@@ -35,10 +35,9 @@ WinWaiter::~WinWaiter()
 }
 
 // wait for events (socket, I/O completion, timeout + application events)
-// ds specifies the maximum amount of time to wait in deciseconds (or ~0 if no
-// timeout scheduled)
-// (this assumes that the second call to addhandle() was coming from the
-// network layer)
+// ds specifies the maximum amount of time to wait in deciseconds (or
+// NEVER if no timeout scheduled) (this assumes that the second call to
+// addhandle() was coming from the network layer)
 int WinWaiter::wait()
 {
     int r = 0;
@@ -47,11 +46,14 @@ int WinWaiter::wait()
     if (index <= MAXIMUM_WAIT_OBJECTS)
     {
         assert(!handles.empty());
-        DWORD dwWaitResult = WaitForMultipleObjectsEx(static_cast<DWORD>(index),
-                                                      &handles.front(),
-                                                      FALSE,
-                                                      static_cast<DWORD>(maxds * 100),
-                                                      TRUE);
+        DWORD dwWaitResult = WaitForMultipleObjectsEx(
+            static_cast<DWORD>(index),
+            &handles.front(),
+            FALSE,
+            (maxds > static_cast<dstime>(std::numeric_limits<DWORD>::max() / 100)) ?
+                std::numeric_limits<DWORD>::max() :
+                static_cast<DWORD>(maxds * 100),
+            TRUE);
 
         assert(dwWaitResult != WAIT_FAILED);