Minor cleanups

This commit was SVN r25289.

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);

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,