instead of relying on yyterminate to clean up the lex context call the destroy functions directly (after closing the file)

This commit was SVN r27577.

ompi/mca/btl/openib/btl_openib_ini.c

@@ -305,6 +305,7 @@ static int parse_file(char *filename)
     }
     save_section(&section);
     fclose(btl_openib_ini_yyin);
+    btl_openib_ini_yylex_destroy ();
 
 cleanup:
     reset_section(true, &section);

ompi/mca/btl/openib/btl_openib_lex.l

@@ -45,9 +45,6 @@ int btl_openib_ini_yynewlines = 1;
 bool btl_openib_ini_parse_done = false;
 char *btl_openib_ini_string = NULL;
 
-#define yyterminate() \
-  return btl_openib_ini_yylex_destroy ()
-
 %}
 
 WHITE       [\f\t\v ]

ompi/mca/btl/wv/btl_wv_ini.c

@@ -299,6 +299,7 @@ static int parse_file(char *filename)
     }
     save_section(&section);
     fclose(btl_wv_ini_yyin);
+    btl_wv_ini_yylex_destroy ();
 
 cleanup:
     reset_section(true, &section);

ompi/mca/btl/wv/btl_wv_lex.l

@@ -43,9 +43,6 @@ int btl_wv_ini_yynewlines = 1;
 bool btl_wv_ini_parse_done = false;
 char *btl_wv_ini_string = NULL;
 
-#define yyterminate() \
-  return btl_wv_ini_yylex_destroy()
-
 %}
 
 WHITE       [\f\t\v ]

ompi/mca/coll/ml/coll_ml_config.c

@@ -551,6 +551,7 @@ static int parse_file(char *filename)
     }
     save_settings(&coll_config);
     fclose(coll_ml_config_yyin);
+    coll_ml_config_yylex_destroy ();
     ret = OMPI_SUCCESS;
 
 cleanup:

ompi/mca/coll/ml/coll_ml_lex.l

@@ -26,9 +26,6 @@ int coll_ml_config_yynewlines = 1;
 bool coll_ml_config_parse_done = false;
 char *coll_ml_config_string = NULL;
 
-#define yyterminate() \
-  return coll_ml_config_yylex_destroy()
-
 %}
 
 WHITE       [\f\t\v ]

opal/util/keyval/keyval_lex.l

@@ -47,9 +47,6 @@ int opal_util_keyval_yynewlines = 1;
 bool opal_util_keyval_parse_done = false;
 char *opal_util_keyval_string = NULL;
 
-#define yyterminate() \
-  return opal_util_keyval_yylex_destroy()
-
 %}
 
 WHITE       [\f\t\v ]

opal/util/keyval_parse.c

@@ -83,6 +83,7 @@ opal_util_keyval_parse(const char *filename,
         }
     }
     fclose(opal_util_keyval_yyin);
+    opal_util_keyval_yylex_destroy ();
 
 cleanup:
     OPAL_THREAD_UNLOCK(&keyval_mutex);

orte/mca/rmaps/rank_file/rmaps_rank_file.c

@@ -503,8 +503,8 @@ static int orte_rmaps_rank_file_parse(const char *rankfile)
         }
     }
     fclose(orte_rmaps_rank_file_in);
-    orte_rmaps_rank_file_in = NULL;
+    orte_rmaps_rank_file_lex_destroy ();
-    
+
 unlock:
     if (NULL != node_name) {
         free(node_name);