Changeset 8669 for trunk/psModules/src/concepts/pmConcepts.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/concepts/pmConcepts.c (modified) (12 diffs)

trunk/psModules/src/concepts/pmConcepts.c

@@ -189 +189 @@
     }
 
-    psTrace("psModules.concepts", 3, "Writing concepts (%x %x %x): %x\n", fpa, chip, cell, source);
+    psTrace("psModules.concepts", 3, "Writing concepts (%p %p %p): %d\n", fpa, chip, cell, source);
 
     if (source & PM_CONCEPT_SOURCE_CAMERA) {
@@ -212 +212 @@
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
-    psTrace("psModules.concepts", 5, "Blanking FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
+    psTrace("psModules.concepts", 5, "Blanking FPA concepts: %p %p\n", conceptsFPA, fpa->concepts);
     return conceptsBlank(&conceptsFPA, fpa->concepts);
 }
@@ -225 +225 @@
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
-    psTrace("psModules.concepts", 5, "Reading FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
+    psTrace("psModules.concepts", 5, "Reading FPA concepts: %p %p\n", conceptsFPA, fpa->concepts);
     bool success = conceptsRead(&conceptsFPA, fpa, NULL, NULL, &fpa->conceptsRead, source, db, fpa->concepts);
     if (propagateDown) {
@@ -248 +248 @@
 {
     PS_ASSERT_PTR_NON_NULL(fpa, false);
-    psTrace("psModules.concepts", 5, "Writing FPA concepts: %x %x\n", conceptsFPA, fpa->concepts);
+    psTrace("psModules.concepts", 5, "Writing FPA concepts: %p %p\n", conceptsFPA, fpa->concepts);
     bool success = conceptsWrite(&conceptsFPA, fpa, NULL, NULL, source, db, fpa->concepts);
     if (propagateDown) {
@@ -267 +267 @@
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
-    psTrace("psModules.concepts", 5, "Blanking chip concepts: %x %x\n", conceptsChip, chip->concepts);
+    psTrace("psModules.concepts", 5, "Blanking chip concepts: %p %p\n", conceptsChip, chip->concepts);
     return conceptsBlank(&conceptsChip, chip->concepts);
 }
@@ -280 +280 @@
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
-    psTrace("psModules.concepts", 5, "Reading chip concepts: %x %x\n", conceptsChip, chip->concepts);
+    psTrace("psModules.concepts", 5, "Reading chip concepts: %p %p\n", conceptsChip, chip->concepts);
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
     bool success = conceptsRead(&conceptsChip, fpa, chip, NULL, &chip->conceptsRead, source, db,
@@ -308 +308 @@
 {
     PS_ASSERT_PTR_NON_NULL(chip, false);
-    psTrace("psModules.concepts", 5, "Writing chip concepts: %x %x\n", conceptsChip, chip->concepts);
+    psTrace("psModules.concepts", 5, "Writing chip concepts: %p %p\n", conceptsChip, chip->concepts);
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
     bool success = conceptsWrite(&conceptsChip, fpa, chip, NULL, source, db, chip->concepts);
@@ -331 +331 @@
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
-    psTrace("psModules.concepts", 5, "Blanking cell concepts: %x %x\n", conceptsCell, cell->concepts);
+    psTrace("psModules.concepts", 5, "Blanking cell concepts: %p %p\n", conceptsCell, cell->concepts);
     return conceptsBlank(&conceptsCell, cell->concepts);
 }
@@ -343 +343 @@
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
-    psTrace("psModules.concepts", 5, "Reading cell concepts: %x %x\n", conceptsCell, cell->concepts);
+    psTrace("psModules.concepts", 5, "Reading cell concepts: %p %p\n", conceptsCell, cell->concepts);
     pmChip *chip = cell->parent;        // Chip to which the cell belongs
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
@@ -371 +371 @@
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
-    psTrace("psModules.concepts", 5, "Writing cell concepts: %x %x\n", conceptsCell, cell->concepts);
+    psTrace("psModules.concepts", 5, "Writing cell concepts: %p %p\n", conceptsCell, cell->concepts);
     pmChip *chip = cell->parent;        // Chip to which the cell belongs
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
@@ -704 +704 @@
     psArray *sourceChips = source->chips; // Chips in source
     if (targetChips->n != sourceChips->n) {
-        psError(PS_ERR_IO, true, "Number of chips in target (%d) and source (%d) differ --- unable to copy "
+        psError(PS_ERR_IO, true, "Number of chips in target (%ld) and source (%ld) differ --- unable to copy "
                 "concepts.\n", targetChips->n, sourceChips->n);
         return false;
@@ -720 +720 @@
         psArray *sourceCells = sourceChip->cells; // Cells in source
         if (targetCells->n != sourceCells->n) {
-            psError(PS_ERR_IO, true, "Number of cells in target (%d) and source (%d) differ for chip %d ---"
+            psError(PS_ERR_IO, true, "Number of cells in target (%ld) and source (%ld) differ for chip %d ---"
                     " unable to copy concepts.\n", targetCells->n, sourceCells->n, i);
             return false;