/*****************************************************************************/
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
struct dirent *d;
char filename[PATH_MAX];
-
- getcwd(dbdirname, sizeof dbdirname);
- strcat(dbdirname, "/data");
+ strcat(dbdirname,ctdl_data_dir);
lprintf(CTDL_DEBUG, "cdb_*: open_databases() starting\n");
lprintf(CTDL_DEBUG, "Compiled db: %s\n", DB_VERSION_STRING);
/*
- * Free a cdbdata item (ok, this is really no big deal, but we might need to do
- * more complex stuff with other database managers in the future).
+ * Free a cdbdata item.
+ *
+ * Note that we only free the 'ptr' portion if it is not NULL. This allows
+ * other code to assume ownership of that memory simply by storing the
+ * pointer elsewhere and then setting 'ptr' to NULL. cdb_free() will then
+ * avoid freeing it.
*/
void cdb_free(struct cdbdata *cdb)
{
- free(cdb->ptr);
+ if (cdb->ptr) {
+ free(cdb->ptr);
+ }
free(cdb);
}