From ad7c84caee991bce89d1b78c61d44bafa274f0b1 Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Thu, 30 Jan 2014 19:56:41 +0000
Subject: [PATCH] Cleanup some stale definitions in the new database components

This commit was SVN r30506.
---
 opal/mca/db/postgres/db_postgres_component.c | 23 ++++++++++++++------
 opal/mca/db/sqlite/db_sqlite.c               |  1 +
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/opal/mca/db/postgres/db_postgres_component.c b/opal/mca/db/postgres/db_postgres_component.c
index 3ef6698730..b572cf38e4 100644
--- a/opal/mca/db/postgres/db_postgres_component.c
+++ b/opal/mca/db/postgres/db_postgres_component.c
@@ -28,7 +28,10 @@ char *opal_db_postgres_file;
 
 static int postgres_component_open(void);
 static int postgres_component_close(void);
-static int postgres_component_query(mca_base_module_t **module, int *priority);
+static int postgres_component_query(opal_db_base_module_t **module,
+                                    int *store_priority,
+                                    int *fetch_priority,
+                                    bool restrict_local);
 static int postgres_component_register(void);
 
 /*
@@ -49,13 +52,14 @@ opal_db_postgres_component_t mca_db_postgres_component = {
             /* Component open and close functions */
             postgres_component_open,
             postgres_component_close,
-            postgres_component_query,
+            NULL,
             postgres_component_register
         },
         {
             /* The component is checkpoint ready */
             MCA_BASE_METADATA_PARAM_CHECKPOINT
-        }
+        },
+        postgres_component_query
     }
 };
 
@@ -66,19 +70,24 @@ static int postgres_component_open(void)
 }
 
 
-static int postgres_component_query(mca_base_module_t **module, int *priority)
+static int postgres_component_query(opal_db_base_module_t **module,
+                                    int *store_priority,
+                                    int *fetch_priority,
+                                    bool restrict_local)
 {
 
     if (NULL != mca_db_postgres_component.dbname &&
         NULL != mca_db_postgres_component.table &&
         NULL != mca_db_postgres_component.user &&
         NULL != mca_db_postgres_component.pguri) {
-        *priority = 3;  /* ahead of sqlite3 */
-        *module = (mca_base_module_t*)&opal_db_postgres_module;
+        *store_priority = 3; /* ahead of sqlite3 */
+        *fetch_priority = 3;
+        *module = &opal_db_postgres_module;
         return OPAL_SUCCESS;
     }
 
-    *priority = 0;
+    *store_priority = 0;
+    *fetch_priority = 0;
     *module = NULL;
     return OPAL_ERROR;
 }
diff --git a/opal/mca/db/sqlite/db_sqlite.c b/opal/mca/db/sqlite/db_sqlite.c
index cf27d2f64d..598cf2d88c 100644
--- a/opal/mca/db/sqlite/db_sqlite.c
+++ b/opal/mca/db/sqlite/db_sqlite.c
@@ -56,6 +56,7 @@ opal_db_base_module_t opal_db_sqlite_module = {
     NULL,
     NULL,
     NULL,
+    NULL,
     add_log
 };