Changeset 8416 for trunk/psLib/src/sys/psTrace.c

Timestamp:

Aug 17, 2006, 4:24:13 PM (20 years ago)

Author:

Paul Price

Message:

Adding assertions.

File:

• trunk/psLib/src/sys/psTrace.c (modified) (10 diffs)

trunk/psLib/src/sys/psTrace.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-17 23:05:23 $
+ *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-18 02:24:13 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -53 +53 @@
 #include <string.h>
 #include <stdarg.h>
+
+#include "psAssert.h"
 #include "psMemory.h"
 #include "psTrace.h"
@@ -77 +79 @@
 static p_psComponent* componentAlloc(const char *name, int level)
 {
+    assert(name);
+
     p_psComponent* comp = psAlloc(sizeof(p_psComponent));
 
@@ -130 +134 @@
 void p_psTraceReset(p_psComponent* currentNode)
 {
+    assert(currentNode);
+
     psS32 i = 0;
 
@@ -163 +169 @@
 static psBool componentAdd(const char *addNodeName, psS32 level)
 {
+    assert(addNodeName);
+
     psS32 i = 0;                        // Loop index variable.
     char name[strlen(addNodeName) + 1]; // buffer for writeable copy.
@@ -262 +270 @@
                     int level)  // desired trace level
 {
+    PS_ASSERT_PTR_NON_NULL(comp, 0);
+
     char *compName = NULL;
     int prevLevel = -1;
@@ -322 +332 @@
 static psS32 doGetTraceLevel(const char *aname)
 {
+    assert(aname);
     char name[strlen(aname) + 1];       // need a writeable copy: for strsep()
     char *pname = name;
@@ -393 +404 @@
 int psTraceGetLevel(const char *name)
 {
+    PS_ASSERT_PTR_NON_NULL(name, 0);
+
     psS32 traceLevel;
 
@@ -452 +465 @@
                                psS32 defLevel)
 {
+    assert(comp);
+
     char line[1024];
     psS32 i = 0;
@@ -644 +659 @@
 )
 {
+    PS_ASSERT_PTR_NON_NULL(file, );
+    PS_ASSERT_PTR_NON_NULL(func, );
+    PS_ASSERT_PTR_NON_NULL(facil, );
+    PS_ASSERT_PTR_NON_NULL(format, );
+
     // XXX file & lineo are currently unused
     va_list ap;