Changeset 7310

Timestamp:

Jun 2, 2006, 2:43:55 PM (20 years ago)

Author:

magnier

Message:

unfolded return arguments to make pmConceptsReadCell more readable

File:

• trunk/psModules/src/concepts/pmConcepts.c (modified) (1 diff)

trunk/psModules/src/concepts/pmConcepts.c

@@ -279 +279 @@
     pmChip *chip = cell->parent;        // Chip to which the cell belongs
     pmFPA *fpa = chip->parent;          // FPA to which the chip belongs
-    return conceptsRead(&conceptsCell, fpa, chip, cell, &cell->conceptsRead, source, db, cell->concepts) &&
-           ((propagate && conceptsRead(&conceptsChip, fpa, chip, cell, &chip->conceptsRead, source, db,
-                                       chip->concepts) &&
-             conceptsRead(&conceptsFPA, fpa, chip, cell, &fpa->conceptsRead, source, db, fpa->concepts)) ||
-            !propagate);
+
+    bool cellSuccess = conceptsRead(&conceptsCell, fpa, chip, cell, &cell->conceptsRead, source, db, cell->concepts);
+
+    bool chipSuccess = true;
+    if (propagate) {
+        chipSuccess = conceptsRead(&conceptsChip, fpa, chip, cell, &chip->conceptsRead, source, db, chip->concepts);
+    }
+
+    bool fpaSuccess = true;
+    if (propagate) {
+        fpaSuccess = conceptsRead(&conceptsFPA, fpa, chip, cell, &fpa->conceptsRead, source, db, fpa->concepts);
+    }
+
+    return (cellSuccess && chipSuccess && fpaSuccess);
 }