From: Art Cancro <ajc@citadel.org>
Date: Mon, 21 Aug 2023 20:49:58 +0000 (-0900)
Subject: cdb_free() is no longer needed; removed from backend API
X-Git-Tag: v989~56
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=7df15f256835b521ec6aedcd9024d61718b43d48;p=citadel.git

cdb_free() is no longer needed; removed from backend API
---

diff --git a/citadel/server/backends/berkeley_db/berkeley_db.c b/citadel/server/backends/berkeley_db/berkeley_db.c
index 7656e4f8b..6b10fcf14 100644
--- a/citadel/server/backends/berkeley_db/berkeley_db.c
+++ b/citadel/server/backends/berkeley_db/berkeley_db.c
@@ -519,9 +519,8 @@ static DBC *bdb_localcursor(int cdb) {
 }
 
 
-// Fetch a piece of data.  If not found, returns NULL.  Otherwise, it returns
-// a struct cdbdata which it is the caller's responsibility to free later on
-// using the bdb_free() routine.
+// Fetch a piece of data.  Returns a "struct cdbdata"
+// cdbdata.len will be 0 if the item is not found.
 struct cdbdata bdb_fetch(int cdb, const void *key, int keylen) {
 
 	struct cdbdata returned_data;
@@ -568,12 +567,6 @@ struct cdbdata bdb_fetch(int cdb, const void *key, int keylen) {
 }
 
 
-// Free a cdbdata item.
-void bdb_free(struct cdbdata *cdb) {
-	free(cdb);
-}
-
-
 void bdb_close_cursor(int cdb) {
 	if (TSD->cursors[cdb] != NULL) {
 		bdb_cclose(TSD->cursors[cdb]);
@@ -733,7 +726,6 @@ void bdb_init_backend(void) {
 	cdb_close_databases = bdb_close_databases;
 	cdb_store = bdb_store;
 	cdb_delete = bdb_delete;
-	cdb_free = bdb_free;
 	cdb_next_item = bdb_next_item;
 	cdb_close_cursor = bdb_close_cursor;
 	cdb_begin_transaction = bdb_begin_transaction;
diff --git a/citadel/server/database.c b/citadel/server/database.c
index 7f6a612aa..9f31ad074 100644
--- a/citadel/server/database.c
+++ b/citadel/server/database.c
@@ -27,7 +27,6 @@ void			(*cdb_close_databases)(void)				= NULL;
 struct cdbdata 		(*cdb_fetch)(int, const void *, int)			= NULL;
 int			(*cdb_store)(int, const void *, int, void *, int)	= NULL;
 int			(*cdb_delete)(int, void *, int)				= NULL;
-void			(*cdb_free)(struct cdbdata *)				= NULL;
 struct cdbdata		(*cdb_next_item)(int)					= NULL;
 void			(*cdb_close_cursor)(int)				= NULL;
 void			(*cdb_begin_transaction)(void)				= NULL;
diff --git a/citadel/server/database.h b/citadel/server/database.h
index d5d1ee802..bcf3da5ba 100644
--- a/citadel/server/database.h
+++ b/citadel/server/database.h
@@ -13,7 +13,6 @@ extern void		(*cdb_open_databases)(void);
 extern void		(*cdb_close_databases)(void);
 extern int		(*cdb_store)(int, const void *, int, void *, int);
 extern int		(*cdb_delete)(int, void *, int);
-extern void		(*cdb_free)(struct cdbdata *);
 extern struct cdbdata	(*cdb_next_item)(int);
 extern void		(*cdb_close_cursor)(int);
 extern void		(*cdb_begin_transaction)(void);