From a40340a098b465d679a9513922b43bf75d48ca82 Mon Sep 17 00:00:00 2001 From: "Michael Bradley, Jr." Date: Sun, 1 Oct 2023 10:56:57 -0500 Subject: [PATCH] consistency for database ID parameter --- cozo-lib-c/cozo_c.h | 6 +++--- cozo-lib-c/src/lib.rs | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cozo-lib-c/cozo_c.h b/cozo-lib-c/cozo_c.h index 7121f6f4..218bad76 100644 --- a/cozo-lib-c/cozo_c.h +++ b/cozo-lib-c/cozo_c.h @@ -25,7 +25,7 @@ extern "C" { * * `engine`: which storage engine to use, can be "mem", "sqlite" or "rocksdb". * `path`: should contain the UTF-8 encoded path name as a null-terminated C-string. - * `db_id`: will contain the id of the database opened. + * `db_id`: will contain the ID of the database opened. * `options`: options for the DB constructor: engine dependent. * * When the function is successful, null pointer is returned, @@ -37,12 +37,12 @@ char *cozo_open_db(const char *engine, const char *path, const char *options, in /** * Close a database. * - * `id`: the ID representing the database to close. + * `db_id`: the ID representing the database to close. * * Returns `true` if the database is closed, * `false` if it has already been closed, or does not exist. */ -bool cozo_close_db(int32_t id); +bool cozo_close_db(int32_t db_id); /** * Run query against a database. diff --git a/cozo-lib-c/src/lib.rs b/cozo-lib-c/src/lib.rs index fd696a26..922b2055 100644 --- a/cozo-lib-c/src/lib.rs +++ b/cozo-lib-c/src/lib.rs @@ -34,7 +34,7 @@ lazy_static! { /// /// `engine`: which storage engine to use, can be "mem", "sqlite" or "rocksdb". /// `path`: should contain the UTF-8 encoded path name as a null-terminated C-string. -/// `db_id`: will contain the id of the database opened. +/// `db_id`: will contain the ID of the database opened. /// `options`: options for the DB constructor: engine dependent. /// /// When the function is successful, null pointer is returned, @@ -76,15 +76,15 @@ pub unsafe extern "C" fn cozo_open_db( /// Close a database. /// -/// `id`: the ID representing the database to close. +/// `db_id`: the ID representing the database to close. /// /// Returns `true` if the database is closed, /// `false` if it has already been closed, or does not exist. #[no_mangle] -pub unsafe extern "C" fn cozo_close_db(id: i32) -> bool { +pub unsafe extern "C" fn cozo_close_db(db_id: i32) -> bool { let db = { let mut dbs = HANDLES.dbs.lock().unwrap(); - dbs.remove(&id) + dbs.remove(&db_id) }; db.is_some() }