Changeset 6116

Timestamp:

Jan 20, 2006, 8:47:19 PM (21 years ago)

Author:

magnier

Message:

made memory traces 64-bit compatible

File:

• branches/eam_rel9_p0/psModules/src/astrom/pmFPA.c (modified) (9 diffs)

branches/eam_rel9_p0/psModules/src/astrom/pmFPA.c

@@ -12 +12 @@
 * XXX: Should we implement non-linear cell->chip transforms?
 *
-*  @version $Revision: 1.1.2.3 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-01-21 04:33:38 $
+*  @version $Revision: 1.1.2.4 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-01-21 06:47:19 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -36 +36 @@
 {
     if (readout != NULL) {
-        psTrace(__func__, 9, "Removing readout %x from cell %x...\n", (unsigned)readout, (unsigned)readout->parent);
+        psTrace(__func__, 9, "Removing readout %lx from cell %lx...\n", (size_t) readout, (size_t) readout->parent);
         if (readout->parent) {
             psArray *readouts = readout->parent->readouts;
@@ -46 +46 @@
             }
         }
-        psTrace(__func__, 9, "Freeing readout %x\n", (unsigned)readout);
+        psTrace(__func__, 9, "Freeing readout %lx\n", (size_t) readout);
         psFree(readout->image);
         psFree(readout->mask);
@@ -62 +62 @@
 {
     if (cell != NULL) {
-        psTrace(__func__, 9, "Removing cell %x from chip %x...\n", (unsigned)cell, (unsigned)cell->parent);
+        psTrace(__func__, 9, "Removing cell %lx from chip %lx...\n", (size_t)cell, (size_t)cell->parent);
         if (cell->parent) {
             psArray *cells = cell->parent->cells;
@@ -72 +72 @@
             }
         }
-        psTrace(__func__, 9, "Freeing cell %x\n", (unsigned)cell);
+        psTrace(__func__, 9, "Freeing cell %lx\n", (size_t)cell);
         psFree(cell->toChip);
         psFree(cell->toFPA);
@@ -90 +90 @@
             tmpReadout->parent = NULL;
             if (PS_FREE_HIERARCHY == 1) {
-                psTrace(__func__, 9, "Will now free readout %x...\n", (unsigned)tmpReadout);
+                psTrace(__func__, 9, "Will now free readout %lx...\n", (size_t)tmpReadout);
                 psFree(tmpReadout);
             }
@@ -104 +104 @@
 {
     if (chip != NULL) {
-        psTrace(__func__, 9, "Removing chip %x from fpa %x...\n", (unsigned)chip, (unsigned)chip->parent);
+        psTrace(__func__, 9, "Removing chip %lx from fpa %lx...\n", (size_t)chip, (size_t)chip->parent);
         if (chip->parent) {
             psArray *chips = chip->parent->chips;
@@ -114 +114 @@
             }
         }
-        psTrace(__func__, 9, "Freeing chip %x\n", (unsigned)chip);
+        psTrace(__func__, 9, "Freeing chip %lx\n", (size_t)chip);
 
         psFree(chip->toFPA);
@@ -145 +145 @@
 {
     if (fpa != NULL) {
-        psTrace(__func__, 9, "Freeing fpa %x\n", (unsigned)fpa);
+        psTrace(__func__, 9, "Freeing fpa %lx\n", (size_t)fpa);
         psFree(fpa->fromTangentPlane);
         psFree(fpa->toTangentPlane);