Changeset 11041

Timestamp:

Jan 11, 2007, 12:55:36 PM (19 years ago)

Author:

Paul Price

Message:

Cleaning up pmConfigConvertFilename.

File:

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

trunk/psModules/src/config/pmConfig.c

@@ -4 +4 @@
  *  @author EAM (IfA)
  *
- *  @version $Revision: 1.71 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-09 03:57:58 $
+ *  @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-11 22:55:36 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1047 +1047 @@
 
 // convert the supplied name, create a new output psString
-psString pmConfigConvertFilename (char *filename, pmConfig *config)
-{
+psString pmConfigConvertFilename(const char *filename, const pmConfig *config)
+{
+    PS_ASSERT_STRING_NON_EMPTY(filename, NULL);
+    PS_ASSERT_PTR_NON_NULL(config, NULL);
 
     psString newName = psStringCopy (filename);
@@ -1065 +1067 @@
     // replace path://PATH with matched datapath
     if (!strncasecmp (newName, "path://", strlen("path://"))) {
+        PS_ASSERT_METADATA_NON_NULL(config->site, NULL);
+
         // filename should be of the form: path://PATH/rest/of/file
         // replace PATH with matching name from config->site:DATAPATH
@@ -1085 +1089 @@
         char *realpath = psMetadataLookupStr (NULL, datapath, path);
         if (realpath == NULL) {
-            psError(PS_ERR_UNKNOWN, true, "path (%s) not defined in config.site:DATAPATH for PATH-style name %s", path, newName);
-            psFree (newName);
-            psFree (path);
+            psError(PS_ERR_UNKNOWN, true,
+                    "path (%s) not defined in config.site:DATAPATH for PATH-style name %s",
+                    path, newName);
+            psFree(newName);
+            psFree(path);
             return false;
         }
-        psFree (path);
+        psFree(path);
 
         char *tmpName = NULL;
-        psStringAppend (&tmpName, "%s/%s", realpath, mark + 1);
-        psFree (newName);
+        psStringAppend(&tmpName, "%s/%s", realpath, mark + 1);
+        psFree(newName);
         newName = tmpName;
     }