Changeset 8669 for trunk/psModules/src/camera/pmFPA.c

Timestamp:

Aug 29, 2006, 11:39:44 AM (20 years ago)

Author:

jhoblitt

Message:

fix a wide range of format string errors

File:

• trunk/psModules/src/camera/pmFPA.c (modified) (9 diffs)

trunk/psModules/src/camera/pmFPA.c

@@ -12 +12 @@
 * XXX: Should we implement non-linear cell->chip transforms?
 *
-*  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-08-09 02:37:07 $
+*  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-29 21:39:44 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -38 +38 @@
     // if this readout has a parent, drop that instance
     if (readout->parent) {
-        psTrace("psModules.camera", 9, "Removing readout %lx from cell %lx...\n", (size_t)readout, (size_t)readout->parent);
+        psTrace("psModules.camera", 9, "Removing readout %zd from cell %zd...\n", (size_t)readout, (size_t)readout->parent);
         psArray *readouts = readout->parent->readouts;
         for (int i = 0; i < readouts->n; i++) {
@@ -46 +46 @@
         }
     }
-    psTrace("psModules.camera", 9, "Freeing readout %lx\n", (size_t) readout);
+    psTrace("psModules.camera", 9, "Freeing readout %zd\n", (size_t) readout);
     psFree(readout->image);
     psFree(readout->mask);
@@ -59 +59 @@
     // if this cell has a parent, drop that instance
     if (cell->parent) {
-        psTrace("psModules.camera", 9, "Removing cell %lx from chip %lx...\n", (size_t)cell, (size_t)cell->parent);
+        psTrace("psModules.camera", 9, "Removing cell %zd from chip %zd...\n", (size_t)cell, (size_t)cell->parent);
         psArray *cells = cell->parent->cells;
         for (int i = 0; i < cells->n; i++) {
@@ -67 +67 @@
         }
     }
-    psTrace("psModules.camera", 9, "Freeing cell %lx\n", (size_t)cell);
+    psTrace("psModules.camera", 9, "Freeing cell %zd\n", (size_t)cell);
     pmCellFreeReadouts(cell);
     psFree(cell->readouts);
@@ -81 +81 @@
     // if this chip has a parent, drop that instance
     if (chip->parent) {
-        psTrace("psModules.camera", 9, "Removing chip %lx from fpa %lx...\n", (size_t)chip, (size_t)chip->parent);
+        psTrace("psModules.camera", 9, "Removing chip %zd from fpa %zd...\n", (size_t)chip, (size_t)chip->parent);
         psArray *chips = chip->parent->chips;
         for (int i = 0; i < chips->n; i++) {
@@ -90 +90 @@
     }
 
-    psTrace("psModules.camera", 9, "Freeing chip %lx\n", (size_t)chip);
+    psTrace("psModules.camera", 9, "Freeing chip %zd\n", (size_t)chip);
     pmChipFreeCells(chip);
     psFree(chip->cells);
@@ -109 +109 @@
 static void FPAFree(pmFPA *fpa)
 {
-    psTrace("psModules.camera", 9, "Freeing fpa %lx\n", (size_t)fpa);
+    psTrace("psModules.camera", 9, "Freeing fpa %zd\n", (size_t)fpa);
 
     // NULL the parent pointers
@@ -149 +149 @@
         }
         tmpReadout->parent = NULL;
-        psTrace("psModules.camera", 9, "Will now free readout %lx...\n", (size_t)tmpReadout);
+        psTrace("psModules.camera", 9, "Will now free readout %zd...\n", (size_t)tmpReadout);
     }
     cell->readouts = psArrayRealloc(cell->readouts, 0);