Changeset 8669 for trunk/psModules/src/imcombine/pmReadoutCombine.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/imcombine/pmReadoutCombine.c (modified) (5 diffs)

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-09 02:37:07 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-29 21:39:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -136 +136 @@
 
         if (!readout || !readout->image) {
-            psError(PS_ERR_UNEXPECTED_NULL, true, "Input readout %d is NULL or has NULL image.\n", i);
+            psError(PS_ERR_UNEXPECTED_NULL, true, "Input readout %ld is NULL or has NULL image.\n", i);
             return false;
         }
@@ -151 +151 @@
         if (readout->weight) {
             if (valid && !haveWeights) {
-                psLogMsg(__func__, PS_LOG_WARN, "Readout %d has a weight map, but others don't --- "
+                psLogMsg(__func__, PS_LOG_WARN, "Readout %ld has a weight map, but others don't --- "
                          "weights ignored.\n", i);
             } else {
@@ -157 +157 @@
             }
         } else if (haveWeights) {
-            psLogMsg(__func__, PS_LOG_WARN, "Readout %d doesn't have a weight map, but others do --- "
+            psLogMsg(__func__, PS_LOG_WARN, "Readout %ld doesn't have a weight map, but others do --- "
                      "weights ignored.\n", i);
             haveWeights = false;
@@ -168 +168 @@
         minInputCols = PS_MIN(minInputCols, readout->col0);
         maxInputCols = PS_MAX(maxInputCols, readout->col0 + readout->image->numCols);
-        psTrace("psModules.imcombine", 7, "Readout %d: offset %d,%d; size %dx%d\n", i,
+        psTrace("psModules.imcombine", 7, "Readout %ld: offset %d,%d; size %dx%d\n", i,
                 readout->col0, readout->row0, readout->image->numCols, readout->image->numRows);
     }