Changeset 9990

Timestamp:

Nov 14, 2006, 3:34:42 PM (20 years ago)

Author:

jhoblitt

Message:

rename psDBInit() -> psDBAlloc() and set psDBFree() as the deallocator func
rename psDBCleanup() -> psDBFree() and make it private
add a macro/wrapper named psDBInit() around psDBAlloc()
add a macro/wrapper named psDBCleanup() around psFree()

Location:

trunk/psLib/src/db

Files:

• psDB.c (modified) (6 diffs)
• psDB.h (modified) (3 diffs)

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.110 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-15 00:54:22 $
+ *  @version $Revision: 1.111 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-11-15 01:34:42 $
  *
  *  Copyright (C) 2005-2006  Joshua Hoblitt, University of Hawaii
@@ -68 +68 @@
 static psHash   *mysqlToSqlLookupTable = NULL;
 static psHash   *pTypeToMysqlLookupTable = NULL;
+
+// free func
+static void psDBFree(psDB *dbh);
 
 // database utility functions
@@ -120 +123 @@
 /*****************************************************************************/
 
-psDB *psDBInit(const char *host,
-               const char *user,
-               const char *passwd,
-               const char *dbname,
-               unsigned int port)
+psDB *psDBAlloc(const char *host,
+                const char *user,
+                const char *passwd,
+                const char *dbname,
+                unsigned int port)
 {
     MYSQL           *mysql;
@@ -180 +183 @@
     }
 
+    // don't set the deallocator func until after we've setup the lookup tables
+    // so an alloc error doesn't try to free potentionally uncreated tables
+    psMemSetDeallocator(dbh, (psFreeFunc) psDBFree);
+
     psTrace("psLib.db", PS_LOG_INFO, "connected to database %s", dbname);
 
@@ -185 +192 @@
 }
 
-void psDBCleanup(psDB *dbh)
+static void psDBFree(psDB *dbh)
 {
     // quietly handle NULLs
@@ -194 +201 @@
     // Attempt to close specified database connection
     mysql_close(dbh->mysql);
-    psFree(dbh);
 
     // ASC WARNING NOTE: the psDBSQLToPTypeTableCleanup cleanup routine

trunk/psLib/src/db/psDB.h

@@ -10 +10 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-13 22:26:14 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-11-15 01:34:42 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -40 +40 @@
 /** Opens a new database connection
  *
- *  @return psDB*:      A new psDB object if the database connection is successful or NULL on
- *  failure.
- */
+ *  @return psDB*:      A new psDB object if the database connection is
+ *  successful or NULL on failure.
+ */
+psDB *psDBAlloc(
+    const char *host,                  ///< Database server hostname
+    const char *user,                  ///< Database username
+    const char *passwd,                ///< Database password
+    const char *dbname,                ///< Database namespace
+    unsigned int port                  ///< Database port number
+);
+
+/** Opens a new database connection
+ *
+ *  This function is deprecated favor of psDBAlloc()
+ *
+ *  @return psDB*:      A new psDB object if the database connection is
+ *  successful or NULL on failure.
+ */
+#ifdef DOXYGEN
 psDB *psDBInit(
     const char *host,                  ///< Database server hostname
@@ -50 +66 @@
     unsigned int port                  ///< Database port number
 );
-
-/** Closes a database connection  */
+#else // DOXYGEN
+#define psDBInit(host, user, passwd, dbname, port) \
+psDBAlloc(host, user, passwd, dbname, port)
+#endif
+
+#ifdef DOXYGEN
+/** Closes a database connection
+ *
+ *  This function is deprecated favor of psFree()
+ */
 void psDBCleanup(
     psDB *dbh                          ///< Database handle
 );
+#else // DOXYGEN
+#define psDBCleanup(dbh) \
+psFree(dbh)
+#endif
 
 /** Creates a new database namespace