Remove some remaining cruft re regular expressions - caused the trunk to fail if regex wasn't being used

This commit was SVN r24861.

orte/mca/odls/base/odls_base_default_fns.c

@@ -2086,7 +2086,6 @@ int orte_odls_base_default_require_sync(orte_process_name_t *proc,
     orte_std_cntr_t cnt;
     int rc=ORTE_SUCCESS;
     bool found=false, registering=false;
-    int8_t flag;
     orte_odls_job_t *jobdat, *jdat;
 
     OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output,
@@ -2189,23 +2188,12 @@ int orte_odls_base_default_require_sync(orte_process_name_t *proc,
         /* the proc needs a copy of both the daemon/node map, and
          * the process map for its peers
          */
-        if (NULL != jobdat->regexp) {
-            /* the data is in a regexp - send that */
-            OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output,
-                                 "%s odls:sync sending regexp %s",
-                                 ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
-                                 jobdat->regexp));
-            flag = 1;
-            opal_dss.pack(&buffer, &flag, 1, OPAL_INT8);
-            opal_dss.pack(&buffer, &jobdat->regexp, 1, OPAL_STRING);
-        } else if (NULL != orte_odls_globals.dmap &&
-                   NULL != jobdat->pmap) {
+        if (NULL != orte_odls_globals.dmap &&
+            NULL != jobdat->pmap) {
             /* the data is in the local byte objects - send them */
             OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output,
                                  "%s odls:sync sending byte object",
                                  ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)));
-            flag = 0;
-            opal_dss.pack(&buffer, &flag, 1, OPAL_INT8);
             opal_dss.pack(&buffer, &orte_odls_globals.dmap, 1, OPAL_BYTE_OBJECT);
             opal_dss.pack(&buffer, &jobdat->pmap, 1, OPAL_BYTE_OBJECT);
             /* add the local system info */

orte/mca/odls/base/odls_base_open.c

@@ -325,7 +325,6 @@ static void orte_odls_job_constructor(orte_odls_job_t *ptr)
     ptr->total_slots_alloc = 0;
     ptr->num_procs = 0;
     ptr->num_local_procs = 0;
-    ptr->regexp = NULL;
     ptr->pmap = NULL;
     OBJ_CONSTRUCT(&ptr->collection_bucket, opal_buffer_t);
     OBJ_CONSTRUCT(&ptr->local_collection, opal_buffer_t);
@@ -356,10 +355,6 @@ static void orte_odls_job_destructor(orte_odls_job_t *ptr)
         }
     }
     
-    if (NULL != ptr->regexp) {
-        free(ptr->regexp);
-    }
-    
     if (NULL != ptr->pmap && NULL != ptr->pmap->bytes) {
         free(ptr->pmap->bytes);
         free(ptr->pmap);

orte/mca/odls/odls_types.h

@@ -145,7 +145,6 @@ typedef struct orte_odls_job_t {
     orte_std_cntr_t         num_nodes;              /* number of nodes involved in the job */
     orte_vpid_t             num_procs;
     int32_t                 num_local_procs;
-    char                    *regexp;                /* the regular expression describing the job */
     opal_byte_object_t      *pmap;                  /* local copy of pidmap byte object */
     opal_buffer_t           collection_bucket;
     opal_buffer_t           local_collection;