Index: /trunk/psLib/src/sys/psMemory.c
===================================================================
--- /trunk/psLib/src/sys/psMemory.c	(revision 1080)
+++ /trunk/psLib/src/sys/psMemory.c	(revision 1081)
@@ -8,6 +8,6 @@
  *  @author Robert Lupton, Princeton University
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-24 03:12:19 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -182,5 +182,4 @@
  * N.b. If the block wasn't allocated by psAlloc, it will appear corrupted
  */
-#define ALIGNED(P) ((void *)((long)(P) & ~03) == (P))
 
 static int checkMemBlock(const psMemBlock *m, const char* funcName)
@@ -191,9 +190,4 @@
     if (m == NULL) {
         psError(funcName,"Memory Corruption: NULL memory block found.");
-        return(1);
-    }
-
-    if (!ALIGNED(m)) {
-        psError(funcName, "psMemCheckCorruption: non-aligned memory block");
         return(1);
     }
Index: /trunk/psLib/src/sys/psTrace.c
===================================================================
--- /trunk/psLib/src/sys/psTrace.c	(revision 1080)
+++ /trunk/psLib/src/sys/psTrace.c	(revision 1081)
@@ -9,6 +9,6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-12 05:50:01 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-24 03:12:19 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -40,13 +40,18 @@
 #include "psError.h"
 
-static Component *p_psCroot = NULL;       // The root of the trace component
+static p_psComponent *p_psCroot = NULL;       // The root of the trace component
 static FILE *p_psTraceFP = NULL;          // File destination for messages.
+
+static void componentFree(p_psComponent *comp);
+static p_psComponent *componentAlloc(const char *name,int level);
+
 /*****************************************************************************
 componentAlloc(): allocate memory for a new node, and initialize members.
  *****************************************************************************/
-Component *componentAlloc(const char *name,
-                          int level)
-{
-    Component *comp = psAlloc(sizeof(Component));
+static p_psComponent *componentAlloc(const char *name,
+                                     int level)
+{
+    p_psComponent *comp = psAlloc(sizeof(p_psComponent));
+    p_psMemSetDeallocator(comp,(psFreeFcn)componentFree);
     comp->name = psStringCopy(name);
     comp->level = level;
@@ -61,5 +66,5 @@
 nodes as well.
  *****************************************************************************/
-static void componentFree(Component *comp)
+static void componentFree(p_psComponent *comp)
 {
     if (comp == NULL) {
@@ -69,5 +74,5 @@
     if (comp->subcomp != NULL) {
         for (int i = 0; i < comp->n; i++) {
-            componentFree(comp->subcomp[i]);
+            psFree(comp->subcomp[i]);
         }
         psFree(comp->subcomp);
@@ -75,5 +80,4 @@
 
     psFree((char *)comp->name);
-    psFree(comp);
 }
 
@@ -93,5 +97,5 @@
 Set all trace levels to zero.
  *****************************************************************************/
-void p_psTraceReset(Component *currentNode)
+void p_psTraceReset(p_psComponent *currentNode)
 {
     int i = 0;
@@ -128,5 +132,5 @@
 void psTraceFree()
 {
-    componentFree(p_psCroot);
+    psFree(p_psCroot);
 }
 
@@ -145,5 +149,5 @@
     char      *pname=name;
     char      *firstComponent = NULL;       // first component of name
-    Component *currentNode = p_psCroot;
+    p_psComponent *currentNode = p_psCroot;
     int        nodeExists = 0;
 
@@ -181,5 +185,5 @@
         if (nodeExists == 0) {
             currentNode->subcomp = psRealloc(currentNode->subcomp,
-                                             (currentNode->n + 1) * sizeof(Component *));
+                                             (currentNode->n + 1) * sizeof(p_psComponent*));
             currentNode->n = (currentNode->n)+1;
 
@@ -237,5 +241,5 @@
     char      *pname=name;
     char      *firstComponent = NULL;   // first component of name
-    Component *currentNode = p_psCroot;
+    p_psComponent *currentNode = p_psCroot;
     int        i = 0;
 
@@ -310,5 +314,5 @@
  null
  *****************************************************************************/
-static void doPrintTraceLevels(const Component *comp,
+static void doPrintTraceLevels(const p_psComponent *comp,
                                int depth)
 {
Index: /trunk/psLib/src/sys/psTrace.h
===================================================================
--- /trunk/psLib/src/sys/psTrace.h	(revision 1080)
+++ /trunk/psLib/src/sys/psTrace.h	(revision 1081)
@@ -9,6 +9,6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-12 05:50:01 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-24 03:12:19 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -23,12 +23,12 @@
     Component structure doesn't in fact contain it's full name, but only the
     last part. */
-typedef struct Component
+typedef struct p_psComponent
 {
     const char *name;                     // last part of name of component
     int level;                            // trace level for this component
     int n;                                // number of subcomponents
-    struct Component **subcomp;           // next level of subcomponents
+    struct p_psComponent **subcomp;           // next level of subcomponents
 }
-Component;
+p_psComponent;
 
 /** \addtogroup LogTrace
Index: /trunk/psLib/src/sysUtils/psMemory.c
===================================================================
--- /trunk/psLib/src/sysUtils/psMemory.c	(revision 1080)
+++ /trunk/psLib/src/sysUtils/psMemory.c	(revision 1081)
@@ -8,6 +8,6 @@
  *  @author Robert Lupton, Princeton University
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-24 03:12:19 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -182,5 +182,4 @@
  * N.b. If the block wasn't allocated by psAlloc, it will appear corrupted
  */
-#define ALIGNED(P) ((void *)((long)(P) & ~03) == (P))
 
 static int checkMemBlock(const psMemBlock *m, const char* funcName)
@@ -191,9 +190,4 @@
     if (m == NULL) {
         psError(funcName,"Memory Corruption: NULL memory block found.");
-        return(1);
-    }
-
-    if (!ALIGNED(m)) {
-        psError(funcName, "psMemCheckCorruption: non-aligned memory block");
         return(1);
     }
Index: /trunk/psLib/src/sysUtils/psTrace.c
===================================================================
--- /trunk/psLib/src/sysUtils/psTrace.c	(revision 1080)
+++ /trunk/psLib/src/sysUtils/psTrace.c	(revision 1081)
@@ -9,6 +9,6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-12 05:50:01 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-24 03:12:19 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -40,13 +40,18 @@
 #include "psError.h"
 
-static Component *p_psCroot = NULL;       // The root of the trace component
+static p_psComponent *p_psCroot = NULL;       // The root of the trace component
 static FILE *p_psTraceFP = NULL;          // File destination for messages.
+
+static void componentFree(p_psComponent *comp);
+static p_psComponent *componentAlloc(const char *name,int level);
+
 /*****************************************************************************
 componentAlloc(): allocate memory for a new node, and initialize members.
  *****************************************************************************/
-Component *componentAlloc(const char *name,
-                          int level)
-{
-    Component *comp = psAlloc(sizeof(Component));
+static p_psComponent *componentAlloc(const char *name,
+                                     int level)
+{
+    p_psComponent *comp = psAlloc(sizeof(p_psComponent));
+    p_psMemSetDeallocator(comp,(psFreeFcn)componentFree);
     comp->name = psStringCopy(name);
     comp->level = level;
@@ -61,5 +66,5 @@
 nodes as well.
  *****************************************************************************/
-static void componentFree(Component *comp)
+static void componentFree(p_psComponent *comp)
 {
     if (comp == NULL) {
@@ -69,5 +74,5 @@
     if (comp->subcomp != NULL) {
         for (int i = 0; i < comp->n; i++) {
-            componentFree(comp->subcomp[i]);
+            psFree(comp->subcomp[i]);
         }
         psFree(comp->subcomp);
@@ -75,5 +80,4 @@
 
     psFree((char *)comp->name);
-    psFree(comp);
 }
 
@@ -93,5 +97,5 @@
 Set all trace levels to zero.
  *****************************************************************************/
-void p_psTraceReset(Component *currentNode)
+void p_psTraceReset(p_psComponent *currentNode)
 {
     int i = 0;
@@ -128,5 +132,5 @@
 void psTraceFree()
 {
-    componentFree(p_psCroot);
+    psFree(p_psCroot);
 }
 
@@ -145,5 +149,5 @@
     char      *pname=name;
     char      *firstComponent = NULL;       // first component of name
-    Component *currentNode = p_psCroot;
+    p_psComponent *currentNode = p_psCroot;
     int        nodeExists = 0;
 
@@ -181,5 +185,5 @@
         if (nodeExists == 0) {
             currentNode->subcomp = psRealloc(currentNode->subcomp,
-                                             (currentNode->n + 1) * sizeof(Component *));
+                                             (currentNode->n + 1) * sizeof(p_psComponent*));
             currentNode->n = (currentNode->n)+1;
 
@@ -237,5 +241,5 @@
     char      *pname=name;
     char      *firstComponent = NULL;   // first component of name
-    Component *currentNode = p_psCroot;
+    p_psComponent *currentNode = p_psCroot;
     int        i = 0;
 
@@ -310,5 +314,5 @@
  null
  *****************************************************************************/
-static void doPrintTraceLevels(const Component *comp,
+static void doPrintTraceLevels(const p_psComponent *comp,
                                int depth)
 {
Index: /trunk/psLib/src/sysUtils/psTrace.h
===================================================================
--- /trunk/psLib/src/sysUtils/psTrace.h	(revision 1080)
+++ /trunk/psLib/src/sysUtils/psTrace.h	(revision 1081)
@@ -9,6 +9,6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-12 05:50:01 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-24 03:12:19 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -23,12 +23,12 @@
     Component structure doesn't in fact contain it's full name, but only the
     last part. */
-typedef struct Component
+typedef struct p_psComponent
 {
     const char *name;                     // last part of name of component
     int level;                            // trace level for this component
     int n;                                // number of subcomponents
-    struct Component **subcomp;           // next level of subcomponents
+    struct p_psComponent **subcomp;           // next level of subcomponents
 }
-Component;
+p_psComponent;
 
 /** \addtogroup LogTrace