Changeset 4373

Timestamp:

Jun 23, 2005, 4:09:23 PM (21 years ago)

Author:

evanalst

Message:

Update function psDBDumpCols to handle invalid parameters.

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.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-24 01:45:09 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-24 02:09:23 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -651 +651 @@
     unsigned int    i;
     psPtr           column;
+
+    // Verify database object is not null
+    if(dbh == NULL) {
+        psError(PS_ERR_UNEXPECTED_NULL,true,PS_ERRORTEXT_psDB_INVALID_PSDB);
+        return NULL;
+    }
+
+    // Verify table name is not null
+    if(tableName == NULL) {
+        psError(PS_ERR_UNEXPECTED_NULL,true,PS_ERRORTEXT_psDB_NULL_TABLE);
+        return NULL;
+    }
 
     // find column types

trunk/psLib/src/dataIO/psFileUtilsErrors.dat

@@ -58 +58 @@
 #
 psDB_INVALID_PSDB                      Invalid psDB has been specified.
+psDB_NULL_TABLE                        NULL table 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.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-17 21:33:46 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-24 02:09:23 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -77 +77 @@
 #define PS_ERRORTEXT_psFits_FITS_Z_SMALL "Current FITS HDU has %d z-planes, but z-plane %d was specified."
 #define PS_ERRORTEXT_psDB_INVALID_PSDB "Invalid psDB has been specified."
+#define PS_ERRORTEXT_psDB_NULL_TABLE "NULL table 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"

trunk/psLib/src/db/psDB.c

@@ -12 +12 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-24 01:45:09 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-24 02:09:23 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -651 +651 @@
     unsigned int    i;
     psPtr           column;
+
+    // Verify database object is not null
+    if(dbh == NULL) {
+        psError(PS_ERR_UNEXPECTED_NULL,true,PS_ERRORTEXT_psDB_INVALID_PSDB);
+        return NULL;
+    }
+
+    // Verify table name is not null
+    if(tableName == NULL) {
+        psError(PS_ERR_UNEXPECTED_NULL,true,PS_ERRORTEXT_psDB_NULL_TABLE);
+        return NULL;
+    }
 
     // find column types