From 015799c7245ed5f7e175155c5dd870cc6563a46e Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@lisas.de>
Date: Tue, 7 Jan 2014 14:16:54 +0000
Subject: [PATCH] Fix COMPRESS/CRS MCA for C/R by returning correct value

Right now the C/R code fails because of a change introduced in
opal/mca/compress/base/compress_base_open.c and
pal/mca/crs/base/crs_base_open.c in 2013 with commit

git 734c724ff76d9bf814f3ab0396bcd9ee6fddcd1b
svn r28239

    Update OPAL frameworks to use the MCA framework system.

This commit changed a lot but also the return value of functions from
OPAL_SUCCESS to OPAL_ERR_NOT_AVAILABLE/OPAL_ERR_NOT_AVAILABLE.

This commit lets opal_compress_base_register() and opal_crs_base_open()
always return OPAL_SUCCESS and removes unneeded #includes.

This commit was SVN r30130.

The following SVN revision numbers were found above:
  r28239 --> open-mpi/ompi@365cf48db50bfc9f7b5a2169442e3a439f125c21
---
 opal/mca/compress/base/compress_base_open.c | 12 ------------
 opal/mca/crs/base/crs_base_open.c           | 10 +---------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/opal/mca/compress/base/compress_base_open.c b/opal/mca/compress/base/compress_base_open.c
index a09fe590a6..75a2c6caae 100644
--- a/opal/mca/compress/base/compress_base_open.c
+++ b/opal/mca/compress/base/compress_base_open.c
@@ -14,13 +14,8 @@
 
 #include "opal_config.h"
 
-#include <string.h>
-#include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
-#include "opal/include/opal/constants.h"
-#include "opal/mca/compress/compress.h"
 #include "opal/mca/compress/base/base.h"
-#include "opal/util/output.h"
 
 #include "opal/mca/compress/base/static-components.h"
 
@@ -45,13 +40,6 @@ MCA_BASE_FRAMEWORK_DECLARE(opal, compress, NULL, opal_compress_base_register, op
 
 static int opal_compress_base_register (mca_base_register_flag_t flags)
 {
-    /* Compression currently only used with C/R */
-    if( !opal_cr_is_enabled ) {
-        opal_output_verbose(10, opal_compress_base_framework.framework_output,
-                            "compress:open: FT is not enabled, skipping!");
-        return OPAL_ERR_NOT_AVAILABLE;
-    }
-
     return OPAL_SUCCESS;
 }
 
diff --git a/opal/mca/crs/base/crs_base_open.c b/opal/mca/crs/base/crs_base_open.c
index 6e3172b492..6bd847736d 100644
--- a/opal/mca/crs/base/crs_base_open.c
+++ b/opal/mca/crs/base/crs_base_open.c
@@ -21,16 +21,8 @@
 
 #include "opal_config.h"
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
-#include "opal/constants.h"
-#include "opal/mca/crs/crs.h"
 #include "opal/mca/crs/base/base.h"
-#include "opal/util/output.h"
 
 #include "opal/mca/crs/base/static-components.h"
 
@@ -90,7 +82,7 @@ int opal_crs_base_open(mca_base_open_flag_t flags)
     if( !opal_cr_is_enabled ) {
         opal_output_verbose(10, opal_crs_base_framework.framework_output,
                             "crs:open: FT is not enabled, skipping!");
-        return OPAL_ERR_NOT_AVAILABLE;;
+        return OPAL_SUCCESS;
     }
 
     return mca_base_framework_components_open (&opal_crs_base_framework, flags);