From 49d6658f60313e1868c8b571f037364919ef463a Mon Sep 17 00:00:00 2001
From: Gilles Gouaillardet <gilles@rist.or.jp>
Date: Wed, 25 Apr 2018 10:05:37 +0900
Subject: [PATCH] Revert "orte_dt_print_node: correctly handle nodes with no
 alias(es)"

This reverts commit 866f449cffe652985c458055bab2a8876ab74657.

Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
---
 .../data_type_support/orte_dt_print_fns.c     | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/orte/runtime/data_type_support/orte_dt_print_fns.c b/orte/runtime/data_type_support/orte_dt_print_fns.c
index 69ec2e1563..d017adc1cf 100644
--- a/orte/runtime/data_type_support/orte_dt_print_fns.c
+++ b/orte/runtime/data_type_support/orte_dt_print_fns.c
@@ -14,8 +14,6 @@
  * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
  *                         All rights reserved.
  * Copyright (c) 2013-2017 Intel, Inc.  All rights reserved.
- * Copyright (c) 2018      Research Organization for Information Science
- *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -312,14 +310,12 @@ int orte_dt_print_node(char **output, char *prefix, orte_node_t *src, opal_data_
             tmp3 = NULL;
             if (orte_get_attribute(&src->attributes, ORTE_NODE_ALIAS, (void**)&tmp3, OPAL_STRING)) {
                 alias = opal_argv_split(tmp3, ',');
-                if (NULL != alias) {
-                    for (i=0; NULL != alias[i]; i++) {
-                        asprintf(&tmp2, "%s%s\tresolved from %s\n", tmp, pfx2, alias[i]);
-                        free(tmp);
-                        tmp = tmp2;
-                    }
-                    opal_argv_free(alias);
+                for (i=0; NULL != alias[i]; i++) {
+                    asprintf(&tmp2, "%s%s\tresolved from %s\n", tmp, pfx2, alias[i]);
+                    free(tmp);
+                    tmp = tmp2;
                 }
+                opal_argv_free(alias);
             }
             if (NULL != tmp3) {
                 free(tmp3);
@@ -335,14 +331,12 @@ int orte_dt_print_node(char **output, char *prefix, orte_node_t *src, opal_data_
         tmp3 = NULL;
         if (orte_get_attribute(&src->attributes, ORTE_NODE_ALIAS, (void**)&tmp3, OPAL_STRING)) {
             alias = opal_argv_split(tmp3, ',');
-            if (NULL != alias) {
-                for (i=0; NULL != alias[i]; i++) {
-                    asprintf(&tmp2, "%s%s\tresolved from %s\n", tmp, pfx2, alias[i]);
-                    free(tmp);
-                    tmp = tmp2;
-                }
-                opal_argv_free(alias);
+            for (i=0; NULL != alias[i]; i++) {
+                asprintf(&tmp2, "%s%s\tresolved from %s\n", tmp, pfx2, alias[i]);
+                free(tmp);
+                tmp = tmp2;
             }
+            opal_argv_free(alias);
         }
         if (NULL != tmp3) {
             free(tmp3);