Changeset 4262

Timestamp:

Jun 14, 2005, 3:47:30 PM (21 years ago)

Author:

evanalst

Message:

Update psDBChange to handle invalid arguments.

Location:

trunk/psLib/src

Files:

• dataIO/psDB.c (modified) (2 diffs)
• dataIO/psFileUtilsErrors.dat (modified) (1 diff)
• dataIO/psFileUtilsErrors.h (modified) (2 diffs)
• db/psDB.c (modified) (2 diffs)

trunk/psLib/src/dataIO/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-15 01:01:08 $
+ *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-15 01:47:30 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -159 +159 @@
 bool psDBChange(psDB *dbh, const char *dbname)
 {
+    // Verify database object is valid
+    if(dbh == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psDB_INVALID_PSDB);
+        return false;
+    }
+
+    // Attempt to select new database
     if (mysql_select_db(dbh->mysql, dbname) != 0) {
-        psError(PS_ERR_UNKNOWN, true, "Failed to change database.  Error: %s", mysql_error(dbh->mysql));
+        psError(PS_ERR_UNKNOWN, true, PS_ERRORTEXT_psDB_FAILED_TO_CHANGE,
+                mysql_error(dbh->mysql));
 
         return false;

trunk/psLib/src/dataIO/psFileUtilsErrors.dat

@@ -59 +59 @@
 psDB_INVALID_PSDB                      Invalid psDB has been specified.
 psDB_FAILED_TO_CONNECT                 Failed to connect to database.  Error: %s
+psDB_FAILED_TO_CHANGE                  Failed to change database.  Error: %s
 #
 

trunk/psLib/src/dataIO/psFileUtilsErrors.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-15 01:01:08 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-15 01:47:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -78 +78 @@
 #define PS_ERRORTEXT_psDB_INVALID_PSDB "Invalid psDB has been specified."
 #define PS_ERRORTEXT_psDB_FAILED_TO_CONNECT "Failed to connect to database.  Error: %s"
+#define PS_ERRORTEXT_psDB_FAILED_TO_CHANGE "Failed to change database.  Error: %s"
 //~End
 

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-15 01:01:08 $
+ *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-15 01:47:30 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -159 +159 @@
 bool psDBChange(psDB *dbh, const char *dbname)
 {
+    // Verify database object is valid
+    if(dbh == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                PS_ERRORTEXT_psDB_INVALID_PSDB);
+        return false;
+    }
+
+    // Attempt to select new database
     if (mysql_select_db(dbh->mysql, dbname) != 0) {
-        psError(PS_ERR_UNKNOWN, true, "Failed to change database.  Error: %s", mysql_error(dbh->mysql));
+        psError(PS_ERR_UNKNOWN, true, PS_ERRORTEXT_psDB_FAILED_TO_CHANGE,
+                mysql_error(dbh->mysql));
 
         return false;