Index: ossp-pkg/xds/find-engine.c
RCS File: /v/ossp/cvs/ossp-pkg/xds/Attic/find-engine.c,v
rcsdiff -q -kk '-r1.3' '-r1.3.2.1' -u '/v/ossp/cvs/ossp-pkg/xds/Attic/find-engine.c,v' 2>/dev/null
--- find-engine.c	2001/07/18 17:49:51	1.3
+++ find-engine.c	2001/08/01 09:55:58	1.3.2.1
@@ -35,9 +35,9 @@
 
     /* Sanity checks. */
 
-    assert(engines != NULL || last == 0);
-    assert(name != NULL);
-    assert(pos != NULL);
+    xds_check_parameter(engines != NULL || last == 0);
+    xds_check_parameter(name != NULL);
+    xds_check_parameter(pos != NULL);
 
     /* Use binary search to find "name" in "engines". */
 
Index: ossp-pkg/xds/getbuffer.c
RCS File: /v/ossp/cvs/ossp-pkg/xds/Attic/getbuffer.c,v
rcsdiff -q -kk '-r1.2' '-r1.2.2.1' -u '/v/ossp/cvs/ossp-pkg/xds/Attic/getbuffer.c,v' 2>/dev/null
--- getbuffer.c	2001/07/09 17:22:03	1.2
+++ getbuffer.c	2001/08/01 09:55:58	1.2.2.1
@@ -32,12 +32,10 @@
     {
     /* Sanity checks. */
 
-    assert(xds != NULL);
-    assert(flag == XDS_GIFT || flag == XDS_LOAN);
-    assert(buffer != NULL);
-    assert(buffer_len != NULL);
-    if (xds == NULL || buffer == NULL || buffer_len == NULL || (flag != XDS_GIFT && flag != XDS_LOAN))
-	return XDS_ERR_INVALID_ARG;
+    xds_check_parameter(xds != NULL);
+    xds_check_parameter(flag == XDS_GIFT || flag == XDS_LOAN);
+    xds_check_parameter(buffer != NULL);
+    xds_check_parameter(buffer_len != NULL);
 
     /* Return the buffer to the caller. */
 
Index: ossp-pkg/xds/internal.h
RCS File: /v/ossp/cvs/ossp-pkg/xds/Attic/internal.h,v
rcsdiff -q -kk '-r1.7' '-r1.7.2.1' -u '/v/ossp/cvs/ossp-pkg/xds/Attic/internal.h,v' 2>/dev/null
--- internal.h	2001/07/31 15:27:45	1.7
+++ internal.h	2001/08/01 09:55:58	1.7.2.1
@@ -66,4 +66,12 @@
 extern const char xds_xml_begin_text[];
 extern const char xds_xml_end_text[];
 
+#define xds_check_parameter(condition)    \
+    do                                    \
+    {                                     \
+    assert(condition);                    \
+    if (!(condition))                     \
+	return XDS_ERR_INVALID_ARG;       \
+    } while(XDS_FALSE)
+
 #endif /* !defined(__INTERNAL_H__) */
Index: ossp-pkg/xds/register.c
RCS File: /v/ossp/cvs/ossp-pkg/xds/Attic/register.c,v
rcsdiff -q -kk '-r1.6' '-r1.6.2.1' -u '/v/ossp/cvs/ossp-pkg/xds/Attic/register.c,v' 2>/dev/null
--- register.c	2001/07/09 17:23:38	1.6
+++ register.c	2001/08/01 09:55:58	1.6.2.1
@@ -37,11 +37,9 @@
 
     /* Sanity checks. */
 
-    assert(xds != NULL);
-    assert(name != NULL);
-    assert(engine != NULL);
-    if (xds == NULL || name == NULL || engine == NULL)
-	return XDS_ERR_INVALID_ARG;
+    xds_check_parameter(xds != NULL);
+    xds_check_parameter(name != NULL);
+    xds_check_parameter(engine != NULL);
     for(pos = 0; name[pos] != '\0'; ++pos)
 	{
 	if (!isalnum(name[pos]) && name[pos] != '-' && name[pos] != '_')
Index: ossp-pkg/xds/set-capacity.c
RCS File: /v/ossp/cvs/ossp-pkg/xds/Attic/set-capacity.c,v
rcsdiff -q -kk '-r1.3' '-r1.3.2.1' -u '/v/ossp/cvs/ossp-pkg/xds/Attic/set-capacity.c,v' 2>/dev/null
--- set-capacity.c	2001/07/16 18:26:58	1.3
+++ set-capacity.c	2001/08/01 09:55:58	1.3.2.1
@@ -36,10 +36,10 @@
 
     /* Sanity checks. */
 
-    assert(array != NULL);
-    assert(array_capacity != NULL);
-    assert(elem_size != 0);
-    assert(initial_capacity != 0);
+    xds_check_parameter(array != NULL);
+    xds_check_parameter(array_capacity != NULL);
+    xds_check_parameter(elem_size != 0);
+    xds_check_parameter(initial_capacity != 0);
 
     /* Do we need to re-allocate? */
 
Index: ossp-pkg/xds/setbuffer.c
RCS File: /v/ossp/cvs/ossp-pkg/xds/Attic/setbuffer.c,v
rcsdiff -q -kk '-r1.6' '-r1.6.2.1' -u '/v/ossp/cvs/ossp-pkg/xds/Attic/setbuffer.c,v' 2>/dev/null
--- setbuffer.c	2001/07/31 06:33:55	1.6
+++ setbuffer.c	2001/08/01 09:55:58	1.6.2.1
@@ -32,12 +32,9 @@
     {
     /* Sanity checks. */
 
-    assert(xds != NULL);
-    assert(flag == XDS_GIFT || flag == XDS_LOAN);
-    assert((buffer != NULL && buffer_len != 0) || flag == XDS_GIFT);
-    if (xds == NULL || (flag != XDS_GIFT && flag != XDS_LOAN) ||
-	(flag == XDS_LOAN && (buffer == NULL || buffer_len == 0)))
-	return XDS_ERR_INVALID_ARG;
+    xds_check_parameter(xds != NULL);
+    xds_check_parameter(flag == XDS_GIFT || flag == XDS_LOAN);
+    xds_check_parameter((buffer != NULL && buffer_len != 0) || flag == XDS_GIFT);
 
     /* Free the old buffer if there is one. */
 
Index: ossp-pkg/xds/unregister.c
RCS File: /v/ossp/cvs/ossp-pkg/xds/Attic/unregister.c,v
rcsdiff -q -kk '-r1.4' '-r1.4.2.1' -u '/v/ossp/cvs/ossp-pkg/xds/Attic/unregister.c,v' 2>/dev/null
--- unregister.c	2001/07/09 17:23:38	1.4
+++ unregister.c	2001/08/01 09:55:58	1.4.2.1
@@ -38,10 +38,8 @@
 
     /* Sanity checks. */
 
-    assert(xds != NULL);
-    assert(name != NULL);
-    if (xds == NULL || name == NULL)
-	return XDS_ERR_INVALID_ARG;
+    xds_check_parameter(xds != NULL);
+    xds_check_parameter(name != NULL);
     for(pos = 0; name[pos] != '\0'; ++pos)
 	{
 	if (!isalnum(name[pos]) && name[pos] != '-' && name[pos] != '_')
Index: ossp-pkg/xds/vdecode.c
RCS File: /v/ossp/cvs/ossp-pkg/xds/Attic/vdecode.c,v
rcsdiff -q -kk '-r1.4' '-r1.4.2.1' -u '/v/ossp/cvs/ossp-pkg/xds/Attic/vdecode.c,v' 2>/dev/null
--- vdecode.c	2001/07/24 15:46:18	1.4
+++ vdecode.c	2001/08/01 09:55:58	1.4.2.1
@@ -40,11 +40,9 @@
 
     /* Sanity checks. */
 
-    assert(xds != NULL);
-    assert(fmt_arg != NULL);
+    xds_check_parameter(xds != NULL);
+    xds_check_parameter(fmt_arg != NULL);
     assert(xds->mode == XDS_DECODE);
-    if (xds == NULL || fmt_arg == NULL)
-	return XDS_ERR_INVALID_ARG;
     if (xds->mode != XDS_DECODE)
 	return XDS_ERR_INVALID_MODE;
 
Index: ossp-pkg/xds/vencode.c
RCS File: /v/ossp/cvs/ossp-pkg/xds/Attic/vencode.c,v
rcsdiff -q -kk '-r1.12' '-r1.12.2.1' -u '/v/ossp/cvs/ossp-pkg/xds/Attic/vencode.c,v' 2>/dev/null
--- vencode.c	2001/07/31 06:33:55	1.12
+++ vencode.c	2001/08/01 09:55:58	1.12.2.1
@@ -41,11 +41,9 @@
 
     /* Sanity checks. */
 
-    assert(xds != NULL);
-    assert(fmt_arg != NULL);
-    assert(xds->mode == XDS_ENCODE);
-    if (xds == NULL || fmt_arg == NULL)
-	return XDS_ERR_INVALID_ARG;
+    xds_check_parameter(xds != NULL);
+    xds_check_parameter(fmt_arg != NULL);
+    xds_check_parameter(xds->mode == XDS_ENCODE);
     if (xds->mode != XDS_ENCODE)
 	return XDS_ERR_INVALID_MODE;