From patchwork Fri Nov 11 20:27:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [12/12] libnsdb: Rename functions in sqlite3.c From: Chuck Lever X-Patchwork-Id: 125293 Message-Id: <20111111202745.10717.46060.stgit@degas.1015granger.net> To: fedfs-utils-devel@oss.oracle.com Date: Fri, 11 Nov 2011 15:27:45 -0500 Clean up: The functions in src/libnsdb/sqlite3.c are part of libnsdb. By convention, functions in this library are named "nsdb_foo". Rename the functions to fit the convention. Signed-off-by: Chuck Lever --- src/libnsdb/nsdb-internal.h | 16 ++++++----- src/libnsdb/nsdb.c | 62 ++++++++++++++++++++++--------------------- src/libnsdb/sqlite.c | 20 +++++++------- 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/libnsdb/nsdb-internal.h b/src/libnsdb/nsdb-internal.h index 6d70666..7c63333 100644 --- a/src/libnsdb/nsdb-internal.h +++ b/src/libnsdb/nsdb-internal.h @@ -115,15 +115,15 @@ FedFsStatus nsdb_right_append_rdn(LDAPDN *dn, LDAPRDN rdn, /** ** Private sqlite-related APIs (sqlite.c) **/ -sqlite3 *fedfs_open_db(const char *db_filename, int flags); -void fedfs_close_db(sqlite3 *db); -_Bool fedfs_prepare_stmt(sqlite3 *db, sqlite3_stmt **stmt, +sqlite3 *nsdb_open_db(const char *db_filename, int flags); +void nsdb_close_db(sqlite3 *db); +_Bool nsdb_prepare_stmt(sqlite3 *db, sqlite3_stmt **stmt, const char *sql); -void fedfs_finalize_stmt(sqlite3_stmt *stmt); -_Bool fedfs_begin_transaction(sqlite3 *db); -void fedfs_end_transaction(sqlite3 *db); -void fedfs_rollback_transaction(sqlite3 *db); -_Bool fedfs_create_table(sqlite3 *db, const char *table_name, +void nsdb_finalize_stmt(sqlite3_stmt *stmt); +_Bool nsdb_begin_transaction(sqlite3 *db); +void nsdb_end_transaction(sqlite3 *db); +void nsdb_rollback_transaction(sqlite3 *db); +_Bool nsdb_create_table(sqlite3 *db, const char *table_name, const char *table_def); #endif /* !_FEDFS_NSDB_INTERNAL_H_ */ diff --git a/src/libnsdb/nsdb.c b/src/libnsdb/nsdb.c index dec2091..cab81b7 100644 --- a/src/libnsdb/nsdb.c +++ b/src/libnsdb/nsdb.c @@ -182,7 +182,7 @@ nsdb_is_default_parentdir(void) static _Bool nsdb_create_tables(sqlite3 *db) { - return fedfs_create_table(db, "nsdbs", + return nsdb_create_table(db, "nsdbs", "nsdbName TEXT, " "nsdbPort INTEGER, " "securityType INTEGER, " @@ -223,7 +223,7 @@ nsdb_init_database(void) __func__, fedfs_base_dirname); } - db = fedfs_open_db(fedfs_db_filename, + db = nsdb_open_db(fedfs_db_filename, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE); if (db == NULL) goto out; @@ -247,7 +247,7 @@ nsdb_init_database(void) retval = true; out_close: - fedfs_close_db(db); + nsdb_close_db(db); out: return retval; @@ -606,7 +606,7 @@ nsdb_read_nsdbname(sqlite3 *db, nsdb_t host) __func__, domainname); retval = FEDFS_ERR_IO; - if (!fedfs_prepare_stmt(db, &stmt, "SELECT" + if (!nsdb_prepare_stmt(db, &stmt, "SELECT" " securityType,securityFilename,defaultBindDN,defaultNCE,followReferrals" " FROM nsdbs WHERE nsdbName=? and nsdbPort=?;")) goto out; @@ -674,7 +674,7 @@ nsdb_read_nsdbname(sqlite3 *db, nsdb_t host) } out_finalize: - fedfs_finalize_stmt(stmt); + nsdb_finalize_stmt(stmt); out: return retval; } @@ -696,7 +696,7 @@ nsdb_new_nsdbname(sqlite3 *db, const nsdb_t host) int rc; retval = FEDFS_ERR_IO; - if (!fedfs_prepare_stmt(db, &stmt, "INSERT INTO nsdbs" + if (!nsdb_prepare_stmt(db, &stmt, "INSERT INTO nsdbs" " (nsdbName,nsdbPort) VALUES(?,?);")) goto out; @@ -732,7 +732,7 @@ nsdb_new_nsdbname(sqlite3 *db, const nsdb_t host) } out_finalize: - fedfs_finalize_stmt(stmt); + nsdb_finalize_stmt(stmt); out: return retval; } @@ -759,7 +759,7 @@ nsdb_update_nsdbname(sqlite3 *db, const nsdb_t host, int rc; retval = FEDFS_ERR_IO; - if (!fedfs_prepare_stmt(db, &stmt, "UPDATE nsdbs " + if (!nsdb_prepare_stmt(db, &stmt, "UPDATE nsdbs " " SET securityType=?,securityFilename=?" "WHERE nsdbName=? and nsdbPort=?;")) goto out; @@ -805,7 +805,7 @@ nsdb_update_nsdbname(sqlite3 *db, const nsdb_t host, } out_finalize: - fedfs_finalize_stmt(stmt); + nsdb_finalize_stmt(stmt); out: return retval; } @@ -829,7 +829,7 @@ nsdb_update_nsdb_default_binddn(sqlite3 *db, const nsdb_t host, int rc; retval = FEDFS_ERR_IO; - if (!fedfs_prepare_stmt(db, &stmt, "UPDATE nsdbs SET defaultBindDN=?" + if (!nsdb_prepare_stmt(db, &stmt, "UPDATE nsdbs SET defaultBindDN=?" " WHERE nsdbName=? and nsdbPort=?;")) goto out; @@ -867,7 +867,7 @@ nsdb_update_nsdb_default_binddn(sqlite3 *db, const nsdb_t host, } out_finalize: - fedfs_finalize_stmt(stmt); + nsdb_finalize_stmt(stmt); out: return retval; } @@ -891,7 +891,7 @@ nsdb_update_nsdb_default_nce(sqlite3 *db, const nsdb_t host, int rc; retval = FEDFS_ERR_IO; - if (!fedfs_prepare_stmt(db, &stmt, "UPDATE nsdbs SET defaultNCE=?" + if (!nsdb_prepare_stmt(db, &stmt, "UPDATE nsdbs SET defaultNCE=?" " WHERE nsdbName=? and nsdbPort=?;")) goto out; @@ -929,7 +929,7 @@ nsdb_update_nsdb_default_nce(sqlite3 *db, const nsdb_t host, } out_finalize: - fedfs_finalize_stmt(stmt); + nsdb_finalize_stmt(stmt); out: return retval; } @@ -953,7 +953,7 @@ nsdb_update_nsdb_follow_referrals(sqlite3 *db, const nsdb_t host, int rc; retval = FEDFS_ERR_IO; - if (!fedfs_prepare_stmt(db, &stmt, "UPDATE nsdbs SET followReferrals=?" + if (!nsdb_prepare_stmt(db, &stmt, "UPDATE nsdbs SET followReferrals=?" " WHERE nsdbName=? and nsdbPort=?;")) goto out; @@ -991,7 +991,7 @@ nsdb_update_nsdb_follow_referrals(sqlite3 *db, const nsdb_t host, } out_finalize: - fedfs_finalize_stmt(stmt); + nsdb_finalize_stmt(stmt); out: return retval; } @@ -1018,7 +1018,7 @@ nsdb_delete_nsdbname(sqlite3 *db, const nsdb_t host) * same whether there was a matching row or not. */ retval = FEDFS_ERR_IO; - if (!fedfs_prepare_stmt(db, &stmt, "DELETE FROM nsdbs " + if (!nsdb_prepare_stmt(db, &stmt, "DELETE FROM nsdbs " "WHERE nsdbName=? and nsdbPort=?;")) goto out; @@ -1049,7 +1049,7 @@ nsdb_delete_nsdbname(sqlite3 *db, const nsdb_t host) } out_finalize: - fedfs_finalize_stmt(stmt); + nsdb_finalize_stmt(stmt); out: return retval; } @@ -1072,7 +1072,7 @@ nsdb_read_nsdbparams(nsdb_t host, struct fedfs_secdata *sec) sqlite3 *db; retval = FEDFS_ERR_IO; - db = fedfs_open_db(fedfs_db_filename, SQLITE_OPEN_READONLY); + db = nsdb_open_db(fedfs_db_filename, SQLITE_OPEN_READONLY); if (db == NULL) goto out; @@ -1096,7 +1096,7 @@ nsdb_read_nsdbparams(nsdb_t host, struct fedfs_secdata *sec) retval = FEDFS_OK; out_close: - fedfs_close_db(db); + nsdb_close_db(db); out: return retval; } @@ -1167,7 +1167,7 @@ nsdb_update_nsdbparams(nsdb_t host, const struct fedfs_secdata *sec) } retval = FEDFS_ERR_IO; - db = fedfs_open_db(fedfs_db_filename, SQLITE_OPEN_READWRITE); + db = nsdb_open_db(fedfs_db_filename, SQLITE_OPEN_READWRITE); if (db == NULL) { free(certfile); goto out; @@ -1190,7 +1190,7 @@ nsdb_update_nsdbparams(nsdb_t host, const struct fedfs_secdata *sec) retval = FEDFS_OK; out_close: - fedfs_close_db(db); + nsdb_close_db(db); out: return retval; } @@ -1241,13 +1241,13 @@ nsdb_update_default_binddn(const char *hostname, const unsigned short port, return retval; retval = FEDFS_ERR_IO; - db = fedfs_open_db(fedfs_db_filename, SQLITE_OPEN_READWRITE); + db = nsdb_open_db(fedfs_db_filename, SQLITE_OPEN_READWRITE); if (db == NULL) goto out; retval = nsdb_update_nsdb_default_binddn(db, host, binddn); - fedfs_close_db(db); + nsdb_close_db(db); out: nsdb_free_nsdb(host); return retval; @@ -1274,13 +1274,13 @@ nsdb_update_default_nce(const char *hostname, const unsigned short port, return retval; retval = FEDFS_ERR_IO; - db = fedfs_open_db(fedfs_db_filename, SQLITE_OPEN_READWRITE); + db = nsdb_open_db(fedfs_db_filename, SQLITE_OPEN_READWRITE); if (db == NULL) goto out; retval = nsdb_update_nsdb_default_nce(db, host, nce); - fedfs_close_db(db); + nsdb_close_db(db); out: nsdb_free_nsdb(host); return retval; @@ -1307,13 +1307,13 @@ nsdb_update_follow_referrals(const char *hostname, const unsigned short port, return retval; retval = FEDFS_ERR_IO; - db = fedfs_open_db(fedfs_db_filename, SQLITE_OPEN_READWRITE); + db = nsdb_open_db(fedfs_db_filename, SQLITE_OPEN_READWRITE); if (db == NULL) goto out; retval = nsdb_update_nsdb_follow_referrals(db, host, follow_referrals); - fedfs_close_db(db); + nsdb_close_db(db); out: nsdb_free_nsdb(host); return retval; @@ -1335,7 +1335,7 @@ nsdb_delete_nsdbparams(nsdb_t host) __func__, host->fn_hostname); retval = FEDFS_ERR_IO; - db = fedfs_open_db(fedfs_db_filename, SQLITE_OPEN_READWRITE); + db = nsdb_open_db(fedfs_db_filename, SQLITE_OPEN_READWRITE); if (db == NULL) goto out; @@ -1346,7 +1346,7 @@ nsdb_delete_nsdbparams(nsdb_t host) retval = FEDFS_OK; out_close: - fedfs_close_db(db); + nsdb_close_db(db); out: return retval; } @@ -1368,7 +1368,7 @@ nsdb_enumerate_nsdbs(char ***nsdblist) sqlite3 *db; retval = FEDFS_ERR_IO; - db = fedfs_open_db(fedfs_db_filename, SQLITE_OPEN_READONLY); + db = nsdb_open_db(fedfs_db_filename, SQLITE_OPEN_READONLY); if (db == NULL) goto out_close; @@ -1430,7 +1430,7 @@ nsdb_enumerate_nsdbs(char ***nsdblist) out_free: sqlite3_free_table(resultp); out_close: - fedfs_close_db(db); + nsdb_close_db(db); return retval; } diff --git a/src/libnsdb/sqlite.c b/src/libnsdb/sqlite.c index 02fadbb..398303c 100644 --- a/src/libnsdb/sqlite.c +++ b/src/libnsdb/sqlite.c @@ -50,7 +50,7 @@ * @return pointer to an open sqlite3 db handle, or NULL */ sqlite3 * -fedfs_open_db(const char *db_filename, int flags) +nsdb_open_db(const char *db_filename, int flags) { sqlite3 *db; int rc; @@ -85,7 +85,7 @@ fedfs_open_db(const char *db_filename, int flags) * @param db pointer to an sqlite3 database handle */ void -fedfs_close_db(sqlite3 *db) +nsdb_close_db(sqlite3 *db) { int rc; @@ -108,7 +108,7 @@ fedfs_close_db(sqlite3 *db) * @return true if statement was prepared, otherwise false */ _Bool -fedfs_prepare_stmt(sqlite3 *db, sqlite3_stmt **stmt, const char *sql) +nsdb_prepare_stmt(sqlite3 *db, sqlite3_stmt **stmt, const char *sql) { int rc; @@ -128,7 +128,7 @@ fedfs_prepare_stmt(sqlite3 *db, sqlite3_stmt **stmt, const char *sql) * @param stmt pointer to sqlite3 statement handle to free */ void -fedfs_finalize_stmt(sqlite3_stmt *stmt) +nsdb_finalize_stmt(sqlite3_stmt *stmt) { sqlite3 *db = sqlite3_db_handle(stmt); int rc; @@ -152,7 +152,7 @@ fedfs_finalize_stmt(sqlite3_stmt *stmt) * @return true if the transaction was started; otherwise FALSE */ _Bool -fedfs_begin_transaction(sqlite3 *db) +nsdb_begin_transaction(sqlite3 *db) { char *err_msg; int rc; @@ -175,7 +175,7 @@ fedfs_begin_transaction(sqlite3 *db) * @param db pointer to an sqlite3 database handle */ void -fedfs_end_transaction(sqlite3 *db) +nsdb_end_transaction(sqlite3 *db) { char *err_msg; int rc; @@ -197,7 +197,7 @@ fedfs_end_transaction(sqlite3 *db) * @param db pointer to an sqlite3 database handle */ void -fedfs_rollback_transaction(sqlite3 *db) +nsdb_rollback_transaction(sqlite3 *db) { char *err_msg; int rc; @@ -224,7 +224,7 @@ fedfs_rollback_transaction(sqlite3 *db) * NB: Do not pass untrusted strings to this function! */ _Bool -fedfs_create_table(sqlite3 *db, const char *table_name, const char *table_def) +nsdb_create_table(sqlite3 *db, const char *table_name, const char *table_def) { sqlite3_stmt *stmt; char *sql; @@ -256,10 +256,10 @@ fedfs_create_table(sqlite3 *db, const char *table_name, const char *table_def) if (rc != SQLITE_DONE) { xlog(L_ERROR, "Failed to create %s table: %s", table_name, sqlite3_errmsg(db)); - fedfs_finalize_stmt(stmt); + nsdb_finalize_stmt(stmt); return false; } - fedfs_finalize_stmt(stmt); + nsdb_finalize_stmt(stmt); xlog(D_CALL, "Created table %s successfully", table_name); return true;