Changeset 262 for trunk/archive/pslib/src/Utils/trace.c

Timestamp:

Mar 19, 2004, 9:11:05 AM (22 years ago)

Author:

rhl

Message:

1/ Correct check for reallocating comp->subcomp
2/ Insert new subcomponent in the right place
3/ Move test code to tst_trace.c

File:

• trunk/archive/pslib/src/Utils/trace.c (modified) (3 diffs)

trunk/archive/pslib/src/Utils/trace.c

@@ -134 +134 @@
      * No match; add cpt0 to this level. Ensure that subcomp is sorted
      */
-    if (comp->n == comp->dimen) {
+    if (comp->n >= comp->dimen - 1) {
         comp->dimen += 5;
-        comp->subcomp = psRealloc(comp->subcomp, comp->dimen);
+        comp->subcomp = psRealloc(comp->subcomp, comp->dimen*sizeof(Component *));
     }
 
@@ -146 +146 @@
                 comp->subcomp[j] = comp->subcomp[j - 1];
             }
+            break;
         }
     }
@@ -300 +301 @@
     }
 }
-
-/*****************************************************************************/
-#if 0                                   // testing
-
-int main(void)
-{
-    psSetLogFormat("NM");               // suppress some of the psLogMsg verbosity
-    
-#if 0
-    psSetTraceLevel("", 10);
-#else
-    psSetTraceLevel("aaa.bbb.ccc.ddd", 9);
-    psSetTraceLevel("aaa.bbb.ccc", 3);
-    psSetTraceLevel("aaa.bbb.ddd", 4);
-    psSetTraceLevel("aaa.BBB", 2);
-    psSetTraceLevel("BBB", 2);
-    psSetTraceLevel("BBB.XXX.YYY.ZZZ", 5);
-    psSetTraceLevel("aaa.bbb", 2);
-    psSetTraceLevel("aaa.bbb.ccc", 9);
-    psSetTraceLevel("aaa", 1);
-#endif
-    
-    psPrintTraceLevels();
-    printf("\n");
-
-    psTrace("aaa.bbb.ddd", 2, "(aaa.bbb.ddd) Hello %s\n", "world");
-    psTrace("aaa", 2, "aaa\n");
-    psTrace("", 2, "\"\"\n");
-    psTrace("aaa.bbb", 2, "aaa.bbb\n");
-    psTrace("aaa.bbb.ddd", 2, "aaa.bbb.ddd\n");
-    psTrace("aaa.bbb.ddd", 4, "aaa.bbb.ddd\n");
-    psTrace("aaa.bbb.ddd", 2, "aaa.bbb.ddd\n");
-    psTrace("aaa.bbb.ccc", 1, "aaa.bbb.ccc\n");
-    psTrace("aaa.bbb.eee", 2, "aaa.bbb.eee\n");
-
-    psTraceReset();
-    fprintf(stderr,"Checking for memory leaks:\n");
-    psMemCheckLeaks(0, NULL, stderr);
-    
-
-    return 0;
-}
-#endif