Fix apparent bug...

[satcheck.git] / execpoint.cc

diff --git a/execpoint.cc b/execpoint.cc
index d35bd8d09efb70d48ca3491e24ec91256447c591..7cfdff5d7bd96f3b70478d0dc9929e139e638a58 100644 (file)
--- a/execpoint.cc
+++ b/execpoint.cc
@@ -43,15 +43,15 @@ void ExecPoint::reset() {
 }
 
 /** Return CR_AFTER means that ep occurs after this.
-               Return CR_BEFORE means tha te occurs before this.
-               Return CR_EQUALS means that they are the same point.
-               Return CR_INCOMPARABLE means that they are not comparable.
-*/
+                Return CR_BEFORE means tha te occurs before this.
+                Return CR_EQUALS means that they are the same point.
+                Return CR_INCOMPARABLE means that they are not comparable.
+ */
 
 CompareResult ExecPoint::compare(const ExecPoint * ep) const {
        if (this==ep)
                return CR_EQUALS;
-       unsigned int minsize=(size<ep->size)?size:ep->size;
+       unsigned int minsize=(size<ep->size) ? size : ep->size;
        for(unsigned int i=0;i<minsize;i+=2) {
                ASSERT(pairarray[i]==ep->pairarray[i]);
                if (pairarray[i+1]!=ep->pairarray[i+1]) {
@@ -122,7 +122,7 @@ bool ExecPointEquals(ExecPoint *e1, ExecPoint * e2) {
                return e2==NULL;
        if (e1->tid != e2->tid || e1->size != e2->size || e1->hashvalue != e2->hashvalue)
                return false;
-       for(unsigned int i=0; i<e1->size; i++) {
+       for(unsigned int i=0;i<e1->size;i++) {
                if (e1->pairarray[i]!=e2->pairarray[i])
                        return false;
        }
@@ -130,26 +130,26 @@ bool ExecPointEquals(ExecPoint *e1, ExecPoint * e2) {
 }
 
 void ExecPoint::print(int f) {
-       dprintf(f,"<tid=%u,",tid);
+       model_dprintf(f,"<tid=%u,",tid);
        for(unsigned int i=0;i<size;i+=2) {
                switch((ExecPointType)pairarray[i]) {
                case EP_BRANCH:
-                       dprintf(f,"br");
+                       model_dprintf(f,"br");
                        break;
                case EP_COUNTER:
-                       dprintf(f,"cnt");
+                       model_dprintf(f,"cnt");
                        break;
                case EP_LOOP:
-                       dprintf(f,"lp");
+                       model_dprintf(f,"lp");
                        break;
                default:
                        ASSERT(false);
                }
-               dprintf(f, "(%u)", pairarray[i+1]);
+               model_dprintf(f, "(%u)", pairarray[i+1]);
                if ((i+2)<size)
-                       dprintf(f, ", ");
+                       model_dprintf(f, ", ");
        }
-       dprintf(f, ">");
+       model_dprintf(f, ">");
 }
 
 void ExecPoint::print() {