Add database adapter as argument to new_oid API

It seems only logical that generating an OID may need information about
database adapter state.

This change does not affect the API used across the code, only existing
adapters. Note it breaks the database modules ABI and render older
database plugins obsolete.

Change-Id: I175b44a8e375914d6c9a1dc8ef8e9271480e0623
Signed-off-by: Paweł Szewczyk <p.szewczyk@samsung.com>

diff --git a/src/core/database.c b/src/core/database.c
index eac6024bd5ca3c4707ae697abd298fd30c806a3f..cab91170bb7ddfe759fb7886a8ee272a196ddb2d 100644 (file)
--- a/src/core/database.c
+++ b/src/core/database.c
@@ -67,7 +67,7 @@ int database_new_oid(faultd_oid_t *oid)
        if (!database_adapter)
                return -ENOSYS;
 
-       return database_adapter->new_oid(oid);
+       return database_adapter->new_oid(database_adapter, oid);
 }
 
 int database_get_well_known_oid(const char *name, faultd_oid_t *oid)

diff --git a/src/core/database.h b/src/core/database.h
index e866d4ed2d350f82002dccbc6ee72a33b10b2f59..53a6ea4faf43a8a85f7d3fd39d0f12dd42d78366 100644 (file)
--- a/src/core/database.h
+++ b/src/core/database.h
@@ -40,7 +40,7 @@ struct faultd_database_adapter {
                                struct faultd_object *query, struct faultd_object *hints,
                                struct faultd_object *result, uint32_t *nr);
 
-       int (*new_oid)(faultd_oid_t *oid);
+       int (*new_oid)(struct faultd_database_adapter *adapter, faultd_oid_t *oid);
 
        int (*get_well_known_oid)(const char *name, faultd_oid_t *oid);
 

diff --git a/src/database/ejdb.c b/src/database/ejdb.c
index a8db8702298af08bb519d86e462c18ce449f6324..e2a909e8a95588b364a3557f6a72976e0c4426bc 100644 (file)
--- a/src/database/ejdb.c
+++ b/src/database/ejdb.c
@@ -411,7 +411,7 @@ finish:
        return ret;
 }
 
-static int ejdb_new_oid(faultd_oid_t *oid)
+static int ejdb_new_oid(struct faultd_database_adapter *adapter, faultd_oid_t *oid)
 {
        sd_id128_t uuid;
 

diff --git a/tests/unit/test_dbadapter.c b/tests/unit/test_dbadapter.c
index 9b38eeae32509580b114fdbc05253000294925c8..3a66a068072454f23c5410adcfd81006828d3e68 100644 (file)
--- a/tests/unit/test_dbadapter.c
+++ b/tests/unit/test_dbadapter.c
@@ -58,7 +58,7 @@ static int testdb_load(struct faultd_database_adapter *adapter,
        return 0;
 }
 
-static int testdb_new_oid(faultd_oid_t *oid)
+static int testdb_new_oid(struct faultd_database_adapter *adapter, faultd_oid_t *oid)
 {
        return 0;
 }