Changeset 10447 for trunk/psModules/src/camera/pmFPAfile.c

Timestamp:

Dec 4, 2006, 12:21:28 PM (19 years ago)

Author:

Paul Price

Message:

Propagating API change to psStringSubstitute

File:

• trunk/psModules/src/camera/pmFPAfile.c (modified) (8 diffs)

trunk/psModules/src/camera/pmFPAfile.c

@@ -182 +182 @@
         char *name = psMetadataLookupStr (NULL, file->names, "OUTPUT");
         if (name != NULL) {
-            newName = psStringSubstitute (newName, name, "{OUTPUT}");
+            psStringSubstitute(&newName, name, "{OUTPUT}");
         }
     }
@@ -190 +190 @@
             char *name = psMetadataLookupStr (NULL, chip->concepts, "CHIP.NAME");
             if (name != NULL) {
-                newName = psStringSubstitute (newName, name, "{CHIP.NAME}");
+                psStringSubstitute(&newName, name, "{CHIP.NAME}");
             }
         }
@@ -201 +201 @@
             psStringAppend (&name, "%02d", view->chip);
         }
-        newName = psStringSubstitute (newName, name, "{CHIP.N}");
+        psStringSubstitute(&newName, name, "{CHIP.N}");
         psFree (name);
     }
@@ -209 +209 @@
             char *name = psMetadataLookupStr (NULL, cell->concepts, "CELL.NAME");
             if (name != NULL) {
-                newName = psStringSubstitute (newName, name, "{CELL.NAME}");
+                psStringSubstitute(&newName, name, "{CELL.NAME}");
             }
         }
@@ -220 +220 @@
             psStringAppend (&name, "%02d", view->cell);
         }
-        newName = psStringSubstitute (newName, name, "{CELL.N}");
+        psStringSubstitute(&newName, name, "{CELL.N}");
     }
     if (strstr (newName, "{EXTNAME}") != NULL) {
         pmHDU *hdu = pmFPAviewThisHDU (view, file->fpa);
         if (hdu->extname && *hdu->extname) {
-            newName = psStringSubstitute (newName, hdu->extname, "{EXTNAME}");
+            psStringSubstitute(&newName, hdu->extname, "{EXTNAME}");
         }
     }
@@ -232 +232 @@
             char *name = psMetadataLookupStr (NULL, file->fpa->concepts, "FPA.FILTER");
             if (name && *name) {
-                newName = psStringSubstitute (newName, name, "{FILTER}");
+                psStringSubstitute(&newName, name, "{FILTER}");
             }
         }
@@ -242 +242 @@
             char *name = psStringCopy ("isp");
             if (name && *name) {
-                newName = psStringSubstitute (newName, name, "{CAMERA}");
+                psStringSubstitute(&newName, name, "{CAMERA}");
             }
             psFree (name);
@@ -254 +254 @@
                 char *ID = psMetadataLookupStr (NULL, filterTable, filterName);
                 if (ID && *ID) {
-                    newName = psStringSubstitute (newName, ID, "{FILTER.ID}");
+                    psStringSubstitute(&newName, ID, "{FILTER.ID}");
                 }
             }