Removed warning (#4693) (#4704)

mergify[bot] · ahcorde · web-flow · commit eb527598ffea · 2024-04-23T16:33:49.000+02:00
* Removed warning Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com> * Added suggestions Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com> --------- Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com> (cherry picked from commit 8258507) Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
diff --git a/src/cpp/fastdds/core/policy/ParameterList.cpp b/src/cpp/fastdds/core/policy/ParameterList.cpp
@@ -117,14 +117,14 @@ bool ParameterList::read_guid_from_cdr_msg(
         fastrtps::rtps::GUID_t& guid)
 {
     bool valid = false;
-    uint16_t pid;
-    uint16_t plength;
+    uint16_t pid = 0;
+    uint16_t plength = 0;
     while (msg.pos < msg.length)
     {
         valid = true;
         valid &= fastrtps::rtps::CDRMessage::readUInt16(&msg, &pid);
         valid &= fastrtps::rtps::CDRMessage::readUInt16(&msg, &plength);
-        if ((pid == PID_SENTINEL) || !valid)
+        if (!valid || (pid == PID_SENTINEL))
         {
             break;
         }

Original file line number	Diff line number	Diff line change
`@@ -117,14 +117,14 @@ bool ParameterList::read_guid_from_cdr_msg(`
`117`	`117`	`fastrtps::rtps::GUID_t& guid)`
`118`	`118`	`{`
`119`	`119`	`bool valid = false;`
`120`		`- uint16_t pid;`
`121`		`- uint16_t plength;`
	`120`	`+ uint16_t pid = 0;`
	`121`	`+ uint16_t plength = 0;`
`122`	`122`	`while (msg.pos < msg.length)`
`123`	`123`	`{`
`124`	`124`	`valid = true;`
`125`	`125`	`valid &= fastrtps::rtps::CDRMessage::readUInt16(&msg, &pid);`
`126`	`126`	`valid &= fastrtps::rtps::CDRMessage::readUInt16(&msg, &plength);`
`127`		`- if ((pid == PID_SENTINEL) \|\| !valid)`
	`127`	`+ if (!valid \|\| (pid == PID_SENTINEL))`
`128`	`128`	`{`
`129`	`129`	`break;`
`130`	`130`	`}`