Index: trunk/psModules/src/camera/pmFPA.c
===================================================================
--- trunk/psModules/src/camera/pmFPA.c	(revision 8582)
+++ trunk/psModules/src/camera/pmFPA.c	(revision 8669)
@@ -12,6 +12,6 @@
 * 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,5 +38,5 @@
     // 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,5 +46,5 @@
         }
     }
-    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,5 +59,5 @@
     // 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,5 +67,5 @@
         }
     }
-    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,5 +81,5 @@
     // 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,5 +90,5 @@
     }
 
-    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,5 +109,5 @@
 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,5 +149,5 @@
         }
         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);
Index: trunk/psModules/src/camera/pmFPACopy.c
===================================================================
--- trunk/psModules/src/camera/pmFPACopy.c	(revision 8582)
+++ trunk/psModules/src/camera/pmFPACopy.c	(revision 8669)
@@ -289,5 +289,5 @@
     psArray *sourceCells = source->cells; // The source cells
     if (targetCells->n != sourceCells->n) {
-        psError(PS_ERR_IO, true, "Number of source cells (%d) differs from the number of target cells (%d)\n",
+        psError(PS_ERR_IO, true, "Number of source cells (%ld) differs from the number of target cells (%ld)\n",
                 sourceCells->n, targetCells->n);
         return false;
@@ -326,5 +326,5 @@
     psArray *sourceChips = source->chips; // The source chips
     if (targetChips->n != sourceChips->n) {
-        psError(PS_ERR_IO, true, "Number of source chips (%d) differs from the number of target chips (%d)\n",
+        psError(PS_ERR_IO, true, "Number of source chips (%ld) differs from the number of target chips (%ld)\n",
                 sourceChips->n, targetChips->n);
         return false;
Index: trunk/psModules/src/camera/pmFPAMosaic.c
===================================================================
--- trunk/psModules/src/camera/pmFPAMosaic.c	(revision 8582)
+++ trunk/psModules/src/camera/pmFPAMosaic.c	(revision 8669)
@@ -586,5 +586,5 @@
         good = false;
     }
-    psTrace("psModules.camera", 5, "Cell %d: x0=%d y0=%d\n", index, x0Cell, y0Cell);
+    psTrace("psModules.camera", 5, "Cell %ld: x0=%d y0=%d\n", index, x0Cell, y0Cell);
 
     // Offset of the chip on the FPA
@@ -682,5 +682,5 @@
     masks->data[index]   = psMemIncrRefCounter(readout->mask);
 
-    psTrace("psModules.camera", 9, "Added cell (%x) %ld: %d,%d; %d,%d, %d,%d.\n", cell, index,
+    psTrace("psModules.camera", 9, "Added cell (%p) %ld: %d,%d; %d,%d, %d,%d.\n", cell, index,
             x0->data.S32[index], y0->data.S32[index], xBin->data.S32[index], yBin->data.S32[index],
             xFlip->data.U8[index], yFlip->data.U8[index]);
Index: trunk/psModules/src/camera/pmFPAfile.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfile.c	(revision 8582)
+++ trunk/psModules/src/camera/pmFPAfile.c	(revision 8669)
@@ -218,5 +218,5 @@
     }
     if (view->chip >= in->chips->n) {
-        psError(PS_ERR_IO, true, "Requested chip == %d >= in->chips->n == %d", view->chip, in->chips->n);
+        psError(PS_ERR_IO, true, "Requested chip == %d >= in->chips->n == %ld", view->chip, in->chips->n);
         return false;
     }
@@ -229,5 +229,5 @@
     }
     if (view->cell >= inChip->cells->n) {
-        psError(PS_ERR_IO, true, "Requested cell == %d>= inChip->cells->n == %d",
+        psError(PS_ERR_IO, true, "Requested cell == %d>= inChip->cells->n == %ld",
                 view->cell, inChip->cells->n);
         return false;
@@ -261,5 +261,5 @@
     }
     if (view->chip >= in->chips->n) {
-        psError(PS_ERR_IO, true, "Requested chip == %d >= in->chips->n == %d", view->chip, in->chips->n);
+        psError(PS_ERR_IO, true, "Requested chip == %d >= in->chips->n == %ld", view->chip, in->chips->n);
         return false;
     }
@@ -272,5 +272,5 @@
     }
     if (view->cell >= inChip->cells->n) {
-        psError(PS_ERR_IO, true, "Requested cell == %d>= inChip->cells->n == %d",
+        psError(PS_ERR_IO, true, "Requested cell == %d>= inChip->cells->n == %ld",
                 view->cell, inChip->cells->n);
         return false;
Index: trunk/psModules/src/camera/pmFPAfileDefine.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfileDefine.c	(revision 8582)
+++ trunk/psModules/src/camera/pmFPAfileDefine.c	(revision 8669)
@@ -243,5 +243,5 @@
             file->camera = pmConfigCameraByName(config, words->data[0]);
             if (!file->camera) {
-                psError(PS_ERR_IO, false, "camera %s not found\n", words->data[0]);
+                psError(PS_ERR_IO, false, "camera %s not found\n", (char *)words->data[0]);
                 psFree(words);
                 return NULL;
@@ -305,5 +305,5 @@
     }
     if (infiles->n < 1) {
-        psError(PS_ERR_IO, false, "Found n == %d files in %s in arguments\n", infiles->n, argname);
+        psError(PS_ERR_IO, false, "Found n == %ld files in %s in arguments\n", infiles->n, argname);
         return NULL;
     }
@@ -318,5 +318,5 @@
     format = pmConfigCameraFormatFromHeader (config, phu);
     if (!format) {
-        psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", infiles->data[0]);
+        psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", (char *)infiles->data[0]);
         psFree(phu);
         return NULL;
@@ -326,5 +326,5 @@
     fpa = pmFPAConstruct (config->camera);
     if (!fpa) {
-        psError(PS_ERR_IO, false, "Failed to construct FPA from %s", infiles->data[0]);
+        psError(PS_ERR_IO, false, "Failed to construct FPA from %s", (char *)infiles->data[0]);
         return NULL;
     }
@@ -433,5 +433,5 @@
     }
     if (infiles->n <= entry) {
-        psError(PS_ERR_IO, false, "only %d files in %s in argument, entry %d requested\n", infiles->n, argname, entry);
+        psError(PS_ERR_IO, false, "only %ld files in %s in argument, entry %d requested\n", infiles->n, argname, entry);
         return NULL;
     }
@@ -448,5 +448,5 @@
     format = pmConfigCameraFormatFromHeader (config, phu);
     if (!format) {
-        psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", infiles->data[0]);
+        psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", (char *)infiles->data[0]);
         psFree(phu);
         return NULL;
@@ -456,5 +456,5 @@
     fpa = pmFPAConstruct (config->camera);
     if (!fpa) {
-        psError(PS_ERR_IO, false, "Failed to construct FPA from %s", infiles->data[0]);
+        psError(PS_ERR_IO, false, "Failed to construct FPA from %s", (char *)infiles->data[0]);
         return NULL;
     }
Index: trunk/psModules/src/camera/pmFPAfileFitsIO.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfileFitsIO.c	(revision 8582)
+++ trunk/psModules/src/camera/pmFPAfileFitsIO.c	(revision 8669)
@@ -30,5 +30,5 @@
 
     if (view->chip >= fpa->chips->n) {
-        psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %d", view->chip, fpa->chips->n);
+        psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %ld", view->chip, fpa->chips->n);
         return false;
     }
@@ -41,5 +41,5 @@
 
     if (view->cell >= chip->cells->n) {
-        psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %d", view->cell, chip->cells->n);
+        psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %ld", view->cell, chip->cells->n);
         return false;
     }
@@ -93,5 +93,5 @@
 
     if (view->chip >= fpa->chips->n) {
-        psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %d", view->chip, fpa->chips->n);
+        psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %ld", view->chip, fpa->chips->n);
         return false;
     }
@@ -104,5 +104,5 @@
 
     if (view->cell >= chip->cells->n) {
-        psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %d", view->cell, chip->cells->n);
+        psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %ld", view->cell, chip->cells->n);
         return false;
     }
@@ -178,5 +178,5 @@
 
     if (view->chip >= fpa->chips->n) {
-        psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %d", view->chip, fpa->chips->n);
+        psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %ld", view->chip, fpa->chips->n);
         return false;
     }
@@ -190,5 +190,5 @@
 
     if (view->cell >= chip->cells->n) {
-        psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %d", view->cell, chip->cells->n);
+        psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %ld", view->cell, chip->cells->n);
         return false;
     }
Index: trunk/psModules/src/camera/pmHDUGenerate.c
===================================================================
--- trunk/psModules/src/camera/pmHDUGenerate.c	(revision 8582)
+++ trunk/psModules/src/camera/pmHDUGenerate.c	(revision 8669)
@@ -252,5 +252,5 @@
                 numReadouts = readouts->n;
             } else if (readouts->n != numReadouts) {
-                psError(PS_ERR_IO, true, "Number of readouts doesn't match: %d vs %d\n", readouts->n,
+                psError(PS_ERR_IO, true, "Number of readouts doesn't match: %ld vs %d\n", readouts->n,
                         numReadouts);
                 return false;
@@ -336,5 +336,5 @@
 
                 if (biassecs->n != readout->bias->n) {
-                    psLogMsg(__func__, PS_LOG_WARN, "Number of bias sections (%d) and number of biases (%d)"
+                    psLogMsg(__func__, PS_LOG_WARN, "Number of bias sections (%ld) and number of biases (%ld)"
                              " do not match.\n", biassecs->n, readout->bias->n);
                 }
Index: trunk/psModules/src/camera/pmHDUUtils.c
===================================================================
--- trunk/psModules/src/camera/pmHDUUtils.c	(revision 8582)
+++ trunk/psModules/src/camera/pmHDUUtils.c	(revision 8669)
@@ -102,5 +102,5 @@
     }
 
-    psTrace("psModules.camera", level + 1, "Format: %x\n", hdu->format);
+    psTrace("psModules.camera", level + 1, "Format: %p\n", hdu->format);
     if (header) {
         if (hdu->header) {