Merge pull request #5943 from bosilca/fix/libnbc_warnings

hjelmn · web-flow · commit a66373454e5b · 2018-10-20T21:24:30.000-06:00
Remove few warnings in libnbc identified by clang-1000.11.45.2
diff --git a/ompi/mca/coll/base/coll_base_bcast.c b/ompi/mca/coll/base/coll_base_bcast.c
@@ -646,7 +646,9 @@ ompi_coll_base_bcast_intra_basic_linear(void *buff, int count,
 
     /* Root sends data to all others. */
     preq = reqs = ompi_coll_base_comm_get_reqs(module->base_data, size-1);
-    if( NULL == reqs ) { err = OMPI_ERR_OUT_OF_RESOURCE; goto err_hndl; }
+    if( NULL == reqs ) {
+        return OMPI_ERR_OUT_OF_RESOURCE;
+    }
 
     for (i = 0; i < size; ++i) {
         if (i == rank) {
diff --git a/ompi/mca/coll/libnbc/nbc_iexscan.c b/ompi/mca/coll/libnbc/nbc_iexscan.c
@@ -18,7 +18,7 @@
  * Author(s): Torsten Hoefler <htor@cs.indiana.edu>
  *
  */
-#include "opal/include/opal/align.h"
+#include "opal/align.h"
 #include "ompi/op/op.h"
 
 #include "nbc_internal.h"
diff --git a/ompi/mca/coll/libnbc/nbc_ireduce.c b/ompi/mca/coll/libnbc/nbc_ireduce.c
@@ -19,7 +19,8 @@
  *
  */
 
-#include "opal/include/opal/align.h"
+#include "ompi_config.h"
+#include "opal/align.h"
 #include "opal/util/bit_ops.h"
 #include "ompi/op/op.h"
 
diff --git a/ompi/mca/coll/libnbc/nbc_ireduce_scatter.c b/ompi/mca/coll/libnbc/nbc_ireduce_scatter.c
@@ -21,7 +21,7 @@
  * Author(s): Torsten Hoefler <htor@cs.indiana.edu>
  *
  */
-#include "opal/include/opal/align.h"
+#include "opal/align.h"
 
 #include "nbc_internal.h"
 
diff --git a/ompi/mca/coll/libnbc/nbc_ireduce_scatter_block.c b/ompi/mca/coll/libnbc/nbc_ireduce_scatter_block.c
@@ -19,7 +19,7 @@
  * Author(s): Torsten Hoefler <htor@cs.indiana.edu>
  *
  */
-#include "opal/include/opal/align.h"
+#include "opal/align.h"
 
 #include "nbc_internal.h"
 
diff --git a/ompi/mca/coll/libnbc/nbc_iscan.c b/ompi/mca/coll/libnbc/nbc_iscan.c
@@ -18,7 +18,7 @@
  * Author(s): Torsten Hoefler <htor@cs.indiana.edu>
  *
  */
-#include "opal/include/opal/align.h"
+#include "opal/align.h"
 #include "ompi/op/op.h"
 
 #include "nbc_internal.h"

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`* Author(s): Torsten Hoefler <[email protected]>`
`19`	`19`	`*`
`20`	`20`	`*/`
`21`		`-#include "opal/include/opal/align.h"`
	`21`	`+#include "opal/align.h"`
`22`	`22`	`#include "ompi/op/op.h"`
`23`	`23`
`24`	`24`	`#include "nbc_internal.h"`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,8 @@`
`19`	`19`	`*`
`20`	`20`	`*/`
`21`	`21`
`22`		`-#include "opal/include/opal/align.h"`
	`22`	`+#include "ompi_config.h"`
	`23`	`+#include "opal/align.h"`
`23`	`24`	`#include "opal/util/bit_ops.h"`
`24`	`25`	`#include "ompi/op/op.h"`
`25`	`26`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`* Author(s): Torsten Hoefler <[email protected]>`
`22`	`22`	`*`
`23`	`23`	`*/`
`24`		`-#include "opal/include/opal/align.h"`
	`24`	`+#include "opal/align.h"`
`25`	`25`
`26`	`26`	`#include "nbc_internal.h"`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`* Author(s): Torsten Hoefler <[email protected]>`
`20`	`20`	`*`
`21`	`21`	`*/`
`22`		`-#include "opal/include/opal/align.h"`
	`22`	`+#include "opal/align.h"`
`23`	`23`
`24`	`24`	`#include "nbc_internal.h"`
`25`	`25`