Changeset 18063

Timestamp:

Jun 10, 2008, 10:58:28 AM (18 years ago)

Author:

jhoblitt

Message:

update pmConfigConvertFilename() API

Location:

trunk

Files:

• ppSub/src/ppSubLoop.c (modified) (1 diff)
• psModules/src/camera/pmFPA_MANAPLOT.c (modified) (2 diffs)
• psModules/test/config/tap_pmConfig.c (modified) (4 diffs)

trunk/ppSub/src/ppSubLoop.c

@@ -24 +24 @@
     FILE *statsFile = NULL;             // File stream for statistics
     if (statsName && strlen(statsName) > 0) {
-        psString resolved = pmConfigConvertFilename(statsName, config, true); // Resolved filename
+        psString resolved = pmConfigConvertFilename(statsName, config, true, false); // Resolved filename
         statsFile = fopen(resolved, "w");
         if (!statsFile) {

trunk/psModules/src/camera/pmFPA_MANAPLOT.c

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-30 21:12:56 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-06-10 20:58:28 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -142 +142 @@
     psString tmpName;
     tmpName = pmFPAfileNameFromRule (file->filextra, file, view);
-    psString input = pmConfigConvertFilename (tmpName, config, create);
+    psString input = pmConfigConvertFilename (tmpName, config, create, false);
     psFree (tmpName);
 
     tmpName = pmFPAfileNameFromRule (file->filerule, file, view);
-    psString output = pmConfigConvertFilename (tmpName, config, create);
+    psString output = pmConfigConvertFilename (tmpName, config, create, false);
     psFree (tmpName);
 
     tmpName = pmFPAfileNameFromRule (file->extname, file, view);
-    psString script = pmConfigConvertFilename (tmpName, config, create);
+    psString script = pmConfigConvertFilename (tmpName, config, create, false);
     psFree (tmpName);
 

trunk/psModules/test/config/tap_pmConfig.c

@@ -20 +20 @@
  * XXXX: Must determine what to do with NULL arguments, then test it.
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-01-02 20:49:09 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-06-10 20:58:28 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -998 +998 @@
         pmConfig *config = pmConfigAlloc();
         bool create = false;
-        bool rc = pmConfigConvertFilename(NULL, (const pmConfig *) config, create);
+        bool rc = pmConfigConvertFilename(NULL, (const pmConfig *) config, create, false);
         ok(rc == false, "pmConfigConvertFilename() returned FALSE with NULL filename pointer");
         psErr *tmpErr = psErrorLast();
@@ -1016 +1016 @@
         pmConfig *config = pmConfigAlloc();
         bool create = false;
-        bool rc = pmConfigConvertFilename(name, NULL, create);
+        bool rc = pmConfigConvertFilename(name, NULL, create, false);
         ok(rc == false, "pmConfigConvertFilename() returned FALSE with NULL config pointer");
         psErr *tmpErr = psErrorLast();
@@ -1051 +1051 @@
         ok(rc == true, "pmConfigFileRead() was successful");
         bool create = false;
-        psString tmpStr = pmConfigConvertFilename(filename, (const pmConfig *) config, create);
+        psString tmpStr = pmConfigConvertFilename(filename, (const pmConfig *) config, create, false);
         ok(NULL == tmpStr, "pmConfigConvertFilename() returned NULL with create==FALSE");
         create = true;
-        tmpStr = pmConfigConvertFilename(filename, (const pmConfig *) config, create);
+        tmpStr = pmConfigConvertFilename(filename, (const pmConfig *) config, create, false);
         ok(tmpStr != NULL, "pmConfigConvertFilename() returned non-NULL with create==TRUE");
         ok(!strcmp(tmpStr, "/JUNK"), "pmConfigConvertFilename() returned correct filename (%s)", tmpStr);