I'd go even slightly simpler than that:

Index: opal/mca/carto/base/carto_base_select.c
===================================================================
--- opal/mca/carto/base/carto_base_select.c     (revision 24842)
+++ opal/mca/carto/base/carto_base_select.c     (working copy)
@@ -64,10 +64,7 @@
 cleanup:
     /* Initialize the winner */
     if (NULL != opal_carto_base_module) {
-        if (OPAL_SUCCESS != (ret = 
opal_carto_base_module->carto_module_init()) ) {
-            exit_status = ret;
-            goto cleanup;
-        }
+        exit_status = opal_carto_base_module->carto_module_init();
     }

     return exit_status;



On Jun 28, 2011, at 3:02 AM, nadia.derbey wrote:

> Hi,
> 
> When using the carto/file module with a syntactically incorrect carto
> file, we get stuck into opal_carto_base_select().
> 
> The attached trivial patch fixes the issue.
> 
> Regards,
> Nadia
> 
> 
> -- 
> nadia.derbey <nadia.der...@bull.net>
> <carto_base_select.patch>_______________________________________________
> devel mailing list
> de...@open-mpi.org
> http://www.open-mpi.org/mailman/listinfo.cgi/devel


-- 
Jeff Squyres
jsquy...@cisco.com
For corporate legal information go to:
http://www.cisco.com/web/about/doing_business/legal/cri/


Reply via email to