Index: generic/nsfPointer.c
===================================================================
diff -u -rcbcfec72376d549a806859c873195cc0ebc9c9ea -r24571ae44c492c681d3efd2f2d2f5169ad7d6d57
--- generic/nsfPointer.c	(.../nsfPointer.c)	(revision cbcfec72376d549a806859c873195cc0ebc9c9ea)
+++ generic/nsfPointer.c	(.../nsfPointer.c)	(revision 24571ae44c492c681d3efd2f2d2f5169ad7d6d57)
@@ -62,13 +62,13 @@
 Nsf_PointerAdd(Tcl_Interp *interp, char *buffer, CONST char *typeName, void *valuePtr) {
   int *counterPtr;
 
-  assert(interp);
-  assert(buffer);
-  assert(typeName);
-  assert(valuePtr);
+  assert(interp != NULL);
+  assert(buffer != NULL);
+  assert(typeName != NULL);
+  assert(valuePtr != NULL);
 
   counterPtr = Nsf_PointerTypeLookup(interp, typeName);
-  if (counterPtr) {
+  if (counterPtr != NULL) {
     Tcl_DString ds, *dsPtr = &ds;
     Tcl_HashEntry *hPtr;
     int isNew;
@@ -115,8 +115,8 @@
 Nsf_PointerGet(char *key, CONST char *prefix) {
   void *valuePtr = NULL;
 
-  assert(key);
-  assert(prefix);
+  assert(key != NULL);
+  assert(prefix != NULL);
 
   /* make sure to return the right type of hash entry */
   if (strncmp(prefix, key, strlen(prefix)) == 0) {
@@ -125,7 +125,7 @@
     NsfMutexLock(&pointerMutex);
     hPtr = Tcl_CreateHashEntry(pointerHashTablePtr, key, NULL);
 
-    if (hPtr) {
+    if (hPtr != NULL) {
       valuePtr = Tcl_GetHashValue(hPtr);
     }
     NsfMutexUnlock(&pointerMutex);
@@ -160,7 +160,7 @@
   Tcl_HashEntry *hPtr;
   Tcl_HashSearch hSrch;
 
-  assert(valuePtr);
+  assert(valuePtr != NULL);
 
   for (hPtr = Tcl_FirstHashEntry(pointerHashTablePtr, &hSrch); hPtr;
        hPtr = Tcl_NextHashEntry(&hSrch)) {
@@ -195,14 +195,15 @@
   Tcl_HashEntry *hPtr;
   int result;
 
-  assert(valuePtr);
+  assert(valuePtr != NULL);
 
   NsfMutexLock(&pointerMutex);
-  hPtr = key
-    ? Tcl_CreateHashEntry(pointerHashTablePtr, key, NULL)
+  hPtr = (key != NULL) ? Tcl_CreateHashEntry(pointerHashTablePtr, key, NULL)
     : Nsf_PointerGetHptr(valuePtr);
-  if (hPtr) {
-    if (free) {ckfree((char *)valuePtr);}
+  if (hPtr != NULL) {
+    if (free != 0) {
+      ckfree((char *)valuePtr);
+    }
     Tcl_DeleteHashEntry(hPtr);
     result = TCL_OK;
   } else {
@@ -241,15 +242,15 @@
 		     ClientData *clientData, Tcl_Obj **outObjPtr) {
   void *valuePtr;
 
-  assert(interp);
-  assert(objPtr);
-  assert(pPtr);
-  assert(clientData);
-  assert(outObjPtr);
+  assert(interp != NULL);
+  assert(objPtr != NULL);
+  assert(pPtr != NULL);
+  assert(clientData != NULL);
+  assert(outObjPtr != NULL);
 
   *outObjPtr = objPtr;
   valuePtr = Nsf_PointerGet(ObjStr(objPtr), pPtr->type);
-  if (valuePtr) {
+  if (valuePtr != NULL) {
     *clientData = valuePtr;
     return TCL_OK;
   }
@@ -276,17 +277,17 @@
   Tcl_HashEntry *hPtr;
   int isNew;
 
-  assert(interp);
-  assert(typeName);
-  assert(counterPtr);
+  assert(interp != NULL);
+  assert(typeName != NULL);
+  assert(counterPtr != NULL);
 
   NsfMutexLock(&pointerMutex);
 
   hPtr = Tcl_CreateHashEntry(pointerHashTablePtr, typeName, &isNew);
 
   NsfMutexUnlock(&pointerMutex);
 
-  if (isNew) {
+  if (isNew != 0) {
     Tcl_SetHashValue(hPtr, counterPtr);
     return TCL_OK;
   } else {
@@ -314,14 +315,14 @@
 Nsf_PointerTypeLookup(Tcl_Interp *interp, CONST char* typeName) {
   Tcl_HashEntry *hPtr;
 
-  assert(interp);
-  assert(typeName);
+  assert(interp != NULL);
+  assert(typeName != NULL);
 
   NsfMutexLock(&pointerMutex);
   hPtr = Tcl_CreateHashEntry(pointerHashTablePtr, typeName, NULL);
   NsfMutexUnlock(&pointerMutex);
 
-  if (hPtr) {
+  if (hPtr != NULL) {
     return Tcl_GetHashValue(hPtr);
   }
   return NULL;
@@ -345,7 +346,7 @@
 void
 Nsf_PointerInit(Tcl_Interp *interp) {
 
-  assert(interp);
+  assert(interp != NULL);
 
   NsfMutexLock(&pointerMutex);
 
@@ -378,7 +379,7 @@
 void
 Nsf_PointerExit(Tcl_Interp *interp) {
 
-  assert(interp);
+  assert(interp != NULL);
 
   NsfMutexLock(&pointerMutex);
   if (--pointerTableRefCount == 0) {