Skip to content

Commit 49d6658

Browse files
committed
Revert "orte_dt_print_node: correctly handle nodes with no alias(es)"
This reverts commit 866f449. Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
1 parent 866f449 commit 49d6658

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

orte/runtime/data_type_support/orte_dt_print_fns.c

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
* Copyright (c) 2011-2013 Los Alamos National Security, LLC.
1515
* All rights reserved.
1616
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
17-
* Copyright (c) 2018 Research Organization for Information Science
18-
* and Technology (RIST). All rights reserved.
1917
* $COPYRIGHT$
2018
*
2119
* Additional copyrights may follow
@@ -312,14 +310,12 @@ int orte_dt_print_node(char **output, char *prefix, orte_node_t *src, opal_data_
312310
tmp3 = NULL;
313311
if (orte_get_attribute(&src->attributes, ORTE_NODE_ALIAS, (void**)&tmp3, OPAL_STRING)) {
314312
alias = opal_argv_split(tmp3, ',');
315-
if (NULL != alias) {
316-
for (i=0; NULL != alias[i]; i++) {
317-
asprintf(&tmp2, "%s%s\tresolved from %s\n", tmp, pfx2, alias[i]);
318-
free(tmp);
319-
tmp = tmp2;
320-
}
321-
opal_argv_free(alias);
313+
for (i=0; NULL != alias[i]; i++) {
314+
asprintf(&tmp2, "%s%s\tresolved from %s\n", tmp, pfx2, alias[i]);
315+
free(tmp);
316+
tmp = tmp2;
322317
}
318+
opal_argv_free(alias);
323319
}
324320
if (NULL != tmp3) {
325321
free(tmp3);
@@ -335,14 +331,12 @@ int orte_dt_print_node(char **output, char *prefix, orte_node_t *src, opal_data_
335331
tmp3 = NULL;
336332
if (orte_get_attribute(&src->attributes, ORTE_NODE_ALIAS, (void**)&tmp3, OPAL_STRING)) {
337333
alias = opal_argv_split(tmp3, ',');
338-
if (NULL != alias) {
339-
for (i=0; NULL != alias[i]; i++) {
340-
asprintf(&tmp2, "%s%s\tresolved from %s\n", tmp, pfx2, alias[i]);
341-
free(tmp);
342-
tmp = tmp2;
343-
}
344-
opal_argv_free(alias);
334+
for (i=0; NULL != alias[i]; i++) {
335+
asprintf(&tmp2, "%s%s\tresolved from %s\n", tmp, pfx2, alias[i]);
336+
free(tmp);
337+
tmp = tmp2;
345338
}
339+
opal_argv_free(alias);
346340
}
347341
if (NULL != tmp3) {
348342
free(tmp3);

0 commit comments

Comments
 (0)