Changeset 874 for trunk/Packages/Common/NetworkAddress.php

Timestamp:

Apr 6, 2020, 11:56:19 PM (5 years ago)

Author:

chronos

Message:

• Modified: Do not use parenthesis around returned value.

File:

• trunk/Packages/Common/NetworkAddress.php (modified) (6 diffs)

trunk/Packages/Common/NetworkAddress.php

@@ -16 +16 @@
   function GetNetMask()
   {
-    return (((1 << IPV4_BIT_WIDTH) - 1) ^ ((1 << (IPV4_BIT_WIDTH - $this->Prefix)) - 1));
+    return ((1 << IPV4_BIT_WIDTH) - 1) ^ ((1 << (IPV4_BIT_WIDTH - $this->Prefix)) - 1);
   }
 
   function AddressToString()
   {
-    return (implode('.', array(($this->Address >> 24) & 255, ($this->Address >> 16) & 255, ($this->Address >> 8) & 255, ($this->Address & 255))));
+    return implode('.', array(($this->Address >> 24) & 255, ($this->Address >> 16) & 255, ($this->Address >> 8) & 255, ($this->Address & 255)));
   }
 
@@ -39 +39 @@
     $To->Address = $From->Address + $HostMask;
     $To->Prefix = IPV4_BIT_WIDTH;
-    return (array('From' => $From, 'To' => $To));
+    return array('From' => $From, 'To' => $To);
   }
 
@@ -55 +55 @@
     if (($this->Prefix < $Address->Prefix) and (($Address->Address & $UpperNetmask) == ($this->Address & $UpperNetmask))) $Result = true;
       else $Result = false;
-    return ($Result);
+    return $Result;
   }
 }
@@ -74 +74 @@
   function GetNetMask()
   {
-    return (Int128Xor(Int128Sub(Int128Shl(IntToInt128(1), IntToInt128(IPV6_BIT_WIDTH)), IntToInt128(1)),
-      Int128Sub(Int128Shl(IntToInt128(1), IntToInt128(IPV6_BIT_WIDTH - $this->Prefix)), IntToInt128(1))));
+    return Int128Xor(Int128Sub(Int128Shl(IntToInt128(1), IntToInt128(IPV6_BIT_WIDTH)), IntToInt128(1)),
+      Int128Sub(Int128Shl(IntToInt128(1), IntToInt128(IPV6_BIT_WIDTH - $this->Prefix)), IntToInt128(1)));
   }
 
   function AddressToString()
   {
-    return (inet_ntop($this->Address));
+    return inet_ntop($this->Address);
   }
 
@@ -106 +106 @@
       $Result[] = dechex(($Item >> 4) & 15);
     }
-    return ($Result);
+    return $Result;
   }
 
@@ -129 +129 @@
     if (($this->Prefix < $Address->Prefix) and ((Int128Equal(Int128And($Address->Address, $UpperNetmask), Int128And($this->Address, $UpperNetmask))))) $Result = true;
       else $Result = false;
-    return ($Result);
+    return $Result;
   }
 }