Merge pull request #1685 from Pythonix/patch-4

jamescowens · web-flow · commit fa597f39c05d · 2020-05-25T12:31:18.000-04:00
Unnecessary if-statement removed
diff --git a/src/protocol.cpp b/src/protocol.cpp
@@ -52,9 +52,7 @@ bool CMessageHeader::IsValid() const
         return false;
 
     // Check the command string for errors
-    if (true)
-    {
-     for (const char* p1 = pchCommand; p1 < pchCommand + COMMAND_SIZE; p1++)
+    for (const char* p1 = pchCommand; p1 < pchCommand + COMMAND_SIZE; p1++)
     {
         if (*p1 == 0)
         {
@@ -66,7 +64,6 @@ bool CMessageHeader::IsValid() const
         else if (*p1 < ' ' || *p1 > 0x7E)
             return false;
     }
-    }
 
     // Message size
     if (nMessageSize > MAX_SIZE)

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,7 @@ bool CMessageHeader::IsValid() const`
`52`	`52`	`return false;`
`53`	`53`
`54`	`54`	`// Check the command string for errors`
`55`		`- if (true)`
`56`		`- {`
`57`		`- for (const char* p1 = pchCommand; p1 < pchCommand + COMMAND_SIZE; p1++)`
	`55`	`+ for (const char* p1 = pchCommand; p1 < pchCommand + COMMAND_SIZE; p1++)`
`58`	`56`	`{`
`59`	`57`	`if (*p1 == 0)`
`60`	`58`	`{`
`@@ -66,7 +64,6 @@ bool CMessageHeader::IsValid() const`
`66`	`64`	`else if (p1 < ' ' \|\| p1 > 0x7E)`
`67`	`65`	`return false;`
`68`	`66`	`}`
`69`		`- }`
`70`	`67`
`71`	`68`	`// Message size`
`72`	`69`	`if (nMessageSize > MAX_SIZE)`