Some minor cleanups:

* don't return null if someone wants to print ORTE_SUCCESS

* rename some stale process types

* keep show_help local if we are in standalone operation as there is nobody to send it to

cmr=v1.7.5:reviewer=jsquyres

This commit was SVN r30400.

orte/util/error_strings.c

@@ -41,6 +41,9 @@ int orte_err2str(int errnum, const char **errmsg)
 {
     const char *retval;
     switch (errnum) {
+    case ORTE_SUCCESS:
+        retval = "Success";
+        break;
     case ORTE_ERR_RECV_LESS_THAN_POSTED:
         retval = "Receive was less than posted size";
         break;

orte/util/proc_info.h

@@ -60,7 +60,7 @@ typedef uint32_t orte_proc_type_t;
 #define ORTE_PROC_MPI           0x0020
 #define ORTE_PROC_APP           0x0030
 #define ORTE_PROC_CM            0x0040
-#define ORTE_PROC_CMSLAVE       0x0080
+#define ORTE_PROC_AGGREGATOR    0x0080
 #define ORTE_PROC_IOF_ENDPT     0x1000
 #define ORTE_PROC_SCHEDULER     0x2000
 
@@ -72,7 +72,7 @@ typedef uint32_t orte_proc_type_t;
 #define ORTE_PROC_IS_MPI            (ORTE_PROC_MPI & orte_process_info.proc_type)
 #define ORTE_PROC_IS_APP            (ORTE_PROC_APP & orte_process_info.proc_type)
 #define ORTE_PROC_IS_CM             (ORTE_PROC_CM & orte_process_info.proc_type)
-#define ORTE_PROC_IS_CMSLAVE        (ORTE_PROC_CMSLAVE & orte_process_info.proc_type)
+#define ORTE_PROC_IS_AGGREGATOR     (ORTE_PROC_AGGREGATOR & orte_process_info.proc_type)
 #define ORTE_PROC_IS_IOF_ENDPT      (ORTE_PROC_IOF_ENDPT & orte_process_info.proc_type)
 #define ORTE_PROC_IS_SCHEDULER      (ORTE_PROC_SCHEDULER & orte_process_info.proc_type)
 

orte/util/show_help.c

@@ -624,10 +624,10 @@ int orte_show_help_norender(const char *filename, const char *topic,
     
     /* if we are the HNP, or the RML has not yet been setup,
      * or ROUTED has not been setup,
-     * or we weren't given an HNP, then all we can do
-     * is process this locally
+     * or we weren't given an HNP, or we are running in standalone
+     * mode, then all we can do is process this locally
      */
-    if (ORTE_PROC_IS_HNP ||
+    if (ORTE_PROC_IS_HNP || orte_standalone_operation ||
         NULL == orte_rml.send_buffer_nb ||
         NULL == orte_routed.get_route ||
         NULL == orte_process_info.my_hnp_uri) {