opal_datatype_copy: fix argument test

jsquyres · jsquyres · commit 480d744b8014 · 2024-08-31T18:09:28.000-04:00
The copy_type tests had what looked like a copy-and-paste error of
testing the arguments.  This was found by gcc 14's static analyzer.

Signed-off-by: Jeff Squyres &lt;jeff@squyres.com&gt;
diff --git a/opal/datatype/opal_datatype_copy.c b/opal/datatype/opal_datatype_copy.c
@@ -17,6 +17,7 @@
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2022      Amazon.com, Inc. or its affiliates.  All Rights reserved.
  * Copyright (c) 2022      Advanced Micro Devices, Inc. All rights reserved.
+ * Copyright (c) 2024      Jeffrey M. Squyres.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -76,7 +77,7 @@ static void *opal_datatype_accelerator_memcpy(void *dest, const void *src, size_
     else if (0 >= dst_type && 0 < src_type) {
 	copy_type = MCA_ACCELERATOR_TRANSFER_DTOH;
     }
-    else if (0 < dst_type && 0 >= dst_type) {
+    else if (0 < dst_type && 0 >= src_type) {
 	copy_type = MCA_ACCELERATOR_TRANSFER_HTOD;
     }
     res = opal_accelerator.mem_copy(dst_dev, src_dev,
@@ -109,7 +110,7 @@ static void *opal_datatype_accelerator_memmove(void *dest, const void *src, size
     else if (0 >= dst_type && 0 < src_type) {
 	copy_type = MCA_ACCELERATOR_TRANSFER_DTOH;
     }
-    else if (0 < dst_type && 0 >= dst_type) {
+    else if (0 < dst_type && 0 >= src_type) {
 	copy_type = MCA_ACCELERATOR_TRANSFER_HTOD;
     }
     res = opal_accelerator.mem_move(dst_dev, src_dev,

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`* and Technology (RIST). All rights reserved.`
`18`	`18`	`* Copyright (c) 2022 Amazon.com, Inc. or its affiliates. All Rights reserved.`
`19`	`19`	`* Copyright (c) 2022 Advanced Micro Devices, Inc. All rights reserved.`
	`20`	`+ * Copyright (c) 2024 Jeffrey M. Squyres. All rights reserved.`
`20`	`21`	`* $COPYRIGHT$`
`21`	`22`	`*`
`22`	`23`	`* Additional copyrights may follow`
`@@ -76,7 +77,7 @@ static void opal_datatype_accelerator_memcpy(void dest, const void *src, size_`
`76`	`77`	`else if (0 >= dst_type && 0 < src_type) {`
`77`	`78`	`copy_type = MCA_ACCELERATOR_TRANSFER_DTOH;`
`78`	`79`	`}`
`79`		`- else if (0 < dst_type && 0 >= dst_type) {`
	`80`	`+ else if (0 < dst_type && 0 >= src_type) {`
`80`	`81`	`copy_type = MCA_ACCELERATOR_TRANSFER_HTOD;`
`81`	`82`	`}`
`82`	`83`	`res = opal_accelerator.mem_copy(dst_dev, src_dev,`
`@@ -109,7 +110,7 @@ static void opal_datatype_accelerator_memmove(void dest, const void *src, size`
`109`	`110`	`else if (0 >= dst_type && 0 < src_type) {`
`110`	`111`	`copy_type = MCA_ACCELERATOR_TRANSFER_DTOH;`
`111`	`112`	`}`
`112`		`- else if (0 < dst_type && 0 >= dst_type) {`
	`113`	`+ else if (0 < dst_type && 0 >= src_type) {`
`113`	`114`	`copy_type = MCA_ACCELERATOR_TRANSFER_HTOD;`
`114`	`115`	`}`
`115`	`116`	`res = opal_accelerator.mem_move(dst_dev, src_dev,`