Index: generic/nsfUtil.c
===================================================================
diff -u -r2e1a88ed8dfe12a82274e26f1e79156d69b618fc -r16a02881bff0a0d626d0045dfd96660338d0c314
--- generic/nsfUtil.c	(.../nsfUtil.c)	(revision 2e1a88ed8dfe12a82274e26f1e79156d69b618fc)
+++ generic/nsfUtil.c	(.../nsfUtil.c)	(revision 16a02881bff0a0d626d0045dfd96660338d0c314)
@@ -100,8 +100,8 @@
   char tmp[LONG_AS_STRING], *pointer = &tmp[1], *string, *p;
   *tmp = 0;
 
-  assert(buf != NULL);
-  assert(lengthPtr != NULL);
+  nonnull_assert(buf != NULL);
+  nonnull_assert(lengthPtr != NULL);
 
   if (i < 0) {
     i = -i;
@@ -155,7 +155,7 @@
 NsfStringIncr(NsfStringIncrStruct *iss) {
   char newch, *currentChar;
 
-  assert(iss != NULL);
+  nonnull_assert(iss != NULL);
 
   currentChar = iss->buffer + iss->bufSize - 2;
   newch = *(alphabet + chartable[(unsigned)*currentChar]);
@@ -220,7 +220,7 @@
   int i = 0;
   const size_t bufSize = (blockIncrement > 2) ? blockIncrement : 2;
 
-  assert(iss != NULL);
+  nonnull_assert(iss != NULL);
 
   for (p=alphabet; *p; p++) {
     chartable[(int)*p] = ++i;
@@ -242,7 +242,7 @@
 void
 NsfStringIncrFree(NsfStringIncrStruct *iss) {
 
-  assert(iss != NULL);
+  nonnull_assert(iss != NULL);
 
   ckfree(iss->buffer);
 }