Remove alwaysExpired, it is identical to 0 and obfuscates the code.

dok-net · dok-net · commit 292c7ccab670 · 2023-07-01T12:11:52.000+02:00
diff --git a/cores/esp8266/PolledTimeout.h b/cores/esp8266/PolledTimeout.h
@@ -146,7 +146,6 @@ class timeoutTemplate
   using timeType = typename TimePolicyT::timeType;
   static_assert(std::is_unsigned<timeType>::value == true, "timeType must be unsigned");
 
-  static constexpr timeType alwaysExpired   = 0;
   static constexpr timeType neverExpires    = std::numeric_limits<timeType>::max();
   static constexpr timeType rangeCompensate = TimePolicyT::rangeCompensate; //debug
 
@@ -177,7 +176,7 @@ class timeoutTemplate
 
   bool canWait () const
   {
-    return _timeout != alwaysExpired && !_oneShotExpired;
+    return _timeout != 0 && !_oneShotExpired;
   }
 
   // Resets, will trigger after this new timeout.
@@ -216,7 +215,7 @@ class timeoutTemplate
 
   void resetToNeverExpires ()
   {
-    _timeout = alwaysExpired + 1; // because canWait() has precedence
+    _timeout = 1; // because canWait() has precedence
     _neverExpires = true;
   }
 
diff --git a/cores/esp8266/Stream.h b/cores/esp8266/Stream.h
@@ -171,7 +171,7 @@ class Stream: public Print {
 
         // transfers already buffered / immediately available data (no timeout)
         // returns number of transferred bytes
-        [[deprecated]] size_t sendAvailable (Print* to) { return sendGeneric(to, -1, -1, oneShotMs::alwaysExpired); }
+        [[deprecated]] size_t sendAvailable (Print* to) { return sendGeneric(to, -1, -1, 0); }
         [[deprecated]] size_t sendAvailable (Print& to) { return sendAvailable(&to); }
 
         // transfers data until timeout

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,6 @@ class timeoutTemplate`
`146`	`146`	`using timeType = typename TimePolicyT::timeType;`
`147`	`147`	`static_assert(std::is_unsigned<timeType>::value == true, "timeType must be unsigned");`
`148`	`148`
`149`		`- static constexpr timeType alwaysExpired = 0;`
`150`	`149`	`static constexpr timeType neverExpires = std::numeric_limits<timeType>::max();`
`151`	`150`	`static constexpr timeType rangeCompensate = TimePolicyT::rangeCompensate; //debug`
`152`	`151`
`@@ -177,7 +176,7 @@ class timeoutTemplate`
`177`	`176`
`178`	`177`	`bool canWait () const`
`179`	`178`	`{`
`180`		`- return _timeout != alwaysExpired && !_oneShotExpired;`
	`179`	`+ return _timeout != 0 && !_oneShotExpired;`
`181`	`180`	`}`
`182`	`181`
`183`	`182`	`// Resets, will trigger after this new timeout.`
`@@ -216,7 +215,7 @@ class timeoutTemplate`
`216`	`215`
`217`	`216`	`void resetToNeverExpires ()`
`218`	`217`	`{`
`219`		`- _timeout = alwaysExpired + 1; // because canWait() has precedence`
	`218`	`+ _timeout = 1; // because canWait() has precedence`
`220`	`219`	`_neverExpires = true;`
`221`	`220`	`}`
`222`	`221`