From f1a5a26ba06b43032f2a43543944d5ef514e0e23 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Fri, 14 Oct 2011 18:46:03 +0000 Subject: [PATCH] Minor cleanups This commit was SVN r25289. --- orte/runtime/orte_init.c | 3 +-- orte/runtime/orte_quit.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/orte/runtime/orte_init.c b/orte/runtime/orte_init.c index daf3100517..5a607e945d 100644 --- a/orte/runtime/orte_init.c +++ b/orte/runtime/orte_init.c @@ -33,7 +33,6 @@ #include "opal/util/error.h" #include "opal/util/output.h" -#include "opal/util/opal_sos.h" #include "opal/runtime/opal.h" #include "orte/util/show_help.h" @@ -148,7 +147,7 @@ int orte_init(int* pargc, char*** pargv, orte_proc_type_t flags) return ORTE_SUCCESS; error: - if (ORTE_ERR_SILENT != OPAL_SOS_GET_ERROR_CODE(ret)) { + if (ORTE_ERR_SILENT != ret) { orte_show_help("help-orte-runtime", "orte_init:startup:internal-failure", true, error, ORTE_ERROR_NAME(ret), ret); diff --git a/orte/runtime/orte_quit.c b/orte/runtime/orte_quit.c index c0e9c8c9fe..c0fa3dff18 100644 --- a/orte/runtime/orte_quit.c +++ b/orte/runtime/orte_quit.c @@ -235,7 +235,7 @@ static void dump_aborted_procs(void) orte_basename); return; } - switch (OPAL_SOS_GET_ERROR_CODE(proc->exit_code)) { + switch (proc->exit_code) { case ORTE_ERR_SYS_LIMITS_PIPES: orte_show_help("help-orterun.txt", "orterun:sys-limit-pipe", true, orte_basename, proc->node->name,