Changeset 25147 for main/trunk/greenstone2/common-src/indexers/mg/lib/sptree.c

Timestamp:

2012-02-28T13:59:00+13:00 (12 years ago)

Author:

kjdon

Message:

merged 64_bit_Greenstone branch into trunk, rev 25139

File:

• main/trunk/greenstone2/common-src/indexers/mg/lib/sptree.c (modified) (4 diffs)

main/trunk/greenstone2/common-src/indexers/mg/lib/sptree.c

@@ -293 +293 @@
         q->par = p;             \
         q->rght = p->left;          \
-        if(q->rght)             \
-            q->rght->par = q;       \
+        if(q->rght){                \
+          q->rght->par = q;         \
+        }                                       \
         p->left = q;                \
-        if(p->par)              \
-            if(q == p->par->left)       \
-                p->par->left = p;   \
-            else                \
-                p->par->rght = p;   \
+        if(p->par){             \
+          if(q == p->par->left){        \
+            p->par->left = p;           \
+          }                                     \
+          else{                 \
+            p->par->rght = p;           \
+          }                                     \
+        }                                       \
     }while(0)
 
@@ -308 +312 @@
         q->par = p;             \
         q->left = p->rght;          \
-        if(q->left)             \
-            q->left->par = q;       \
+        if(q->left){                \
+          q->left->par = q;         \
+        }                                       \
         p->rght = q;                \
-        if(p->par)              \
-            if(q == p->par->left)       \
-                p->par->left = p;   \
-            else                \
-                p->par->rght = p;   \
+        if(p->par){             \
+          if(q == p->par->left){        \
+            p->par->left = p;           \
+          }                                     \
+          else{                             \
+            p->par->rght = p;           \
+          }                                     \
+        }                                       \
     }while(0)
 
@@ -341 +349 @@
       if (p == q->left)
     {
-      if (g == NNULL)
+      if (g == NNULL){
         ROTATER (p, q);
+      }
       else if (q == g->left)
         {
@@ -356 +365 @@
       else
     {
-      if (g == NNULL)
+      if (g == NNULL){
         ROTATEL (p, q);
+      }
       else if (q == g->rght)
         {