Changeset 7278 for trunk/psModules/src/config/pmConfig.c

Timestamp:

Jun 1, 2006, 2:55:23 PM (20 years ago)

Author:

Paul Price

Message:

Addition of a vast quantity of assertions in public functions. Adopted a policy of using assert() within file-static functions (since they are only called internally, any errors there are problems with the program) and using the PS_ASSERT_WHATEVER() macros within public functions. Cleaned a few things up in the process.

File:

• trunk/psModules/src/config/pmConfig.c (modified) (10 diffs)

trunk/psModules/src/config/pmConfig.c

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-23 23:37:23 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-02 00:55:22 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -69 +69 @@
     const char *description)            // Description of file
 {
+    assert(config);
+    assert(name && strlen(name) > 0);
+    assert(description && strlen(description) > 0);
+
     char *realName = NULL;
     unsigned int numBadLines = 0;
@@ -303 +307 @@
         }
         if (logFD == STDIN_FILENO) {
-            psLogMsg(__func__, PS_LOG_WARN, "Only STDERR and STDOUT currently supported as a log destination.\n");
+            psLogMsg(__func__, PS_LOG_WARN, "Only STDERR and STDOUT currently supported as a log "
+                     "destination.\n");
             logFD = STDERR_FILENO;
         }
@@ -352 +357 @@
     const psMetadata *header)
 {
+    PS_ASSERT_PTR_NON_NULL(cameraFormat, false);
+    PS_ASSERT_PTR_NON_NULL(header, false);
+
     // Read the rule for that camera format
     bool mdStatus = true;
@@ -395 +403 @@
     assert(camera);
     assert(header);
+    assert(cameraName && strlen(cameraName) > 0);
 
     bool result = false;                // Did we find the first match?
@@ -449 +458 @@
 )
 {
+    PS_ASSERT_PTR_NON_NULL(config, NULL);
+    PS_ASSERT_PTR_NON_NULL(header, NULL);
+
     psMetadata *format = NULL;          // The winning format
     bool mdok = false;                  // Metadata lookup status
@@ -562 +574 @@
 )
 {
+    PS_ASSERT_PTR_NON_NULL(config, NULL);
+    PS_ASSERT_PTR_NON_NULL(config->site, NULL);
+
     #ifdef OMIT_PSDB
+
     return NULL;
     #else
 
-    PS_ASSERT_PTR_NON_NULL(config->site, NULL);
     psBool mdStatus01 = false;
     psBool mdStatus02 = false;
@@ -590 +605 @@
                           )
 {
+    PS_ASSERT_PTR_NON_NULL(header, false);
+    PS_ASSERT_PTR_NON_NULL(format, false);
+
     bool mdok = true;                   // Status of MD lookup
     psMetadata *rules = psMetadataLookupMD(&mdok, format, "RULE"); // How to identify this format
@@ -613 +631 @@
 psArray *pmConfigFileSets (int *argc, char **argv, char *file, char *list)
 {
+    PS_ASSERT_PTR_NON_NULL(argc, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(*argc, NULL);
+    PS_ASSERT_PTR_NON_NULL(argv, NULL);
+    PS_ASSERT_PTR_NON_NULL(file, NULL);
+    PS_ASSERT_INT_POSITIVE(strlen(file), NULL);
+    PS_ASSERT_PTR_NON_NULL(list, NULL);
+    PS_ASSERT_INT_POSITIVE(strlen(list), NULL);
 
     int Narg;
@@ -670 +695 @@
 bool pmConfigFileSetsMD (psMetadata *metadata, int *argc, char **argv, char *name, char *file, char *list)
 {
+    PS_ASSERT_PTR_NON_NULL(metadata, false);
+    PS_ASSERT_PTR_NON_NULL(argc, false);
+    PS_ASSERT_INT_NONNEGATIVE(*argc, NULL);
+    PS_ASSERT_PTR_NON_NULL(argv, false);
+    PS_ASSERT_PTR_NON_NULL(name, false);
+    PS_ASSERT_INT_POSITIVE(strlen(name), NULL);
+    PS_ASSERT_PTR_NON_NULL(file, false);
+    PS_ASSERT_INT_POSITIVE(strlen(file), NULL);
+    PS_ASSERT_PTR_NON_NULL(list, false);
+    PS_ASSERT_INT_POSITIVE(strlen(list), NULL);
 
     psArray *files = pmConfigFileSets (argc, argv, file, list);