- Silence compiler on ORTE_TRANSPORT_KEY_FMT, it is fixed to llx

- No functional changes, just indentation and corrections to error
   output.

This commit was SVN r12734.

opal/runtime/opal_init.c

@@ -166,8 +166,8 @@ opal_init_util(void)
     }
 
     /* pretty-print stack handlers */
-    if (OPAL_SUCCESS != (ret = opal_util_register_stackhandlers ())) {
+    if (OPAL_SUCCESS != (ret = opal_util_register_stackhandlers())) {
-        error = "util_register_stackhandlers() failed";
+        error = "opal_util_register_stackhandlers";
         goto return_error;
     }
 
@@ -222,7 +222,7 @@ opal_init(void)
 
     /* initialize the memory manager / tracker */
     if (OPAL_SUCCESS != opal_mem_hooks_init()) {
-        error = "opal_mem_free_init";
+        error = "opal_mem_hooks_init";
         goto return_error;
     }
 

orte/runtime/orte_setup_hnp.c

@@ -488,7 +488,7 @@ MOVEON:
         OPAL_THREAD_UNLOCK(&orte_setup_hnp_mutex);
 
         if (ORTE_SUCCESS == orte_setup_hnp_rc) {
-            /* Remember if we were infrastructre or not */
+            /* Remember if we were infrastructure or not */
             id = mca_base_param_find("orte", NULL, "infrastructure");
             mca_base_param_lookup_int(id, &intparam);
             if ( ((int)true) != intparam) {

orte/tools/orterun/orterun.c

@@ -194,14 +194,14 @@ opal_cmd_line_init_t cmd_line_init[] = {
       &orterun_globals.by_slot, OPAL_CMD_LINE_TYPE_BOOL,
       "Whether to allocate/map processes round-robin by slot (the default)" },
     { NULL, NULL, NULL, '\0', "pernode", "pernode", 0,
-        &orterun_globals.per_node, OPAL_CMD_LINE_TYPE_BOOL,
+      &orterun_globals.per_node, OPAL_CMD_LINE_TYPE_BOOL,
-        "If no number of process is specified, this will cause one process per available node to be executed" },
+      "If no number of process is specified, this will cause one process per available node to be executed" },
     { NULL, NULL, NULL, '\0', "nooversubscribe", "nooversubscribe", 0,
       &orterun_globals.no_oversubscribe, OPAL_CMD_LINE_TYPE_BOOL,
       "Nodes are not to be oversubscribed, even if the system supports such operation"},
     { "rmaps", "base", "display_map", '\0', "display-map-at-launch", "display-map-at-launch", 0,
-        NULL, OPAL_CMD_LINE_TYPE_BOOL,
+      NULL, OPAL_CMD_LINE_TYPE_BOOL,
-        "Display the process map just before launch"},
+      "Display the process map just before launch"},
     
     /* mpiexec-like arguments */
     { NULL, NULL, NULL, '\0', "wdir", "wdir", 1,
@@ -263,8 +263,8 @@ opal_cmd_line_init_t cmd_line_init[] = {
       "Set the root for the session directory tree for orterun ONLY" },
 
     { NULL, NULL, NULL, '\0', "reuse-daemons", "reuse-daemons", 0,
-        &orterun_globals.reuse_daemons, OPAL_CMD_LINE_TYPE_BOOL,
+      &orterun_globals.reuse_daemons, OPAL_CMD_LINE_TYPE_BOOL,
-        "If set, reuse daemons to launch dynamically spawned processes"},
+      "If set, reuse daemons to launch dynamically spawned processes"},
 
     { NULL, NULL, NULL, '\0', NULL, "prefix", 1,
       NULL, OPAL_CMD_LINE_TYPE_STRING,

orte/util/pre_condition_transports.c

@@ -100,8 +100,8 @@ int orte_pre_condition_transports(orte_app_context_t **app_context, size_t num_c
     }
 #endif  /* !defined(__WINDOWS__) */
 
-    sprintf(string_key, ORTE_TRANSPORT_KEY_FMT, (long unsigned)unique_key[0], 
+    sprintf(string_key, ORTE_TRANSPORT_KEY_FMT, (long long unsigned)unique_key[0], 
-            (long unsigned)unique_key[1]);
+            (long long unsigned)unique_key[1]);
     string_key[sizeof string_key - 1] = '\0';
     
     if (NULL == (cs_env = mca_base_param_environ_variable("orte_precondition_transports",NULL,NULL))) {