star-3dut

Generate meshes of simple geometric shapes
git clone git://git.meso-star.fr/star-3dut.git
Log | Files | Refs | README | LICENSE
commit d90d34a46c9af91683d6e6edec4cfcd5ad6981be
parent edca541949cd31ce411b0c5da65c38c7a7cb3c17
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue, 12 Dec 2017 15:30:36 +0100

Merge branch 'release_0.3.1'

Diffstat:

MREADME.md | 11+++++------


Mcmake/CMakeLists.txt | 6+++---


Msrc/test_s3dut_cuboid.c | 54+++++++++++++++++++++++++++---------------------------


Msrc/test_s3dut_cylinder.c | 88++++++++++++++++++++++++++++++++++++++++----------------------------------------


Msrc/test_s3dut_hemisphere.c | 78+++++++++++++++++++++++++++++++++++++++---------------------------------------


Msrc/test_s3dut_sphere.c | 76++++++++++++++++++++++++++++++++++++++--------------------------------------


Msrc/test_s3dut_super_shape.c | 154++++++++++++++++++++++++++++++++++++++++----------------------------------------


Msrc/test_s3dut_thick_cylinder.c | 164++++++++++++++++++++++++++++++++++++++++----------------------------------------


Msrc/test_s3dut_thick_truncated_sphere.c | 106++++++++++++++++++++++++++++++++++++++++----------------------------------------


Msrc/test_s3dut_thick_truncated_super_shape.c | 278++++++++++++++++++++++++++++++++++++++++----------------------------------------


Msrc/test_s3dut_thin_cylinder.c | 106++++++++++++++++++++++++++++++++++++++++----------------------------------------


Msrc/test_s3dut_truncated_sphere.c | 30+++++++++++++++---------------


Msrc/test_s3dut_utils.h | 2+-


13 files changed, 576 insertions(+), 577 deletions(-)

diff --git a/README.md b/README.md
@@ -15,29 +15,28 @@ the install directories of its dependencies.
 
 ## Release notes
 
+### Version 0.3.1
+
+- Update the version of the RSys dependency to 0.6: replace the deprecated
+  `[N]CHECK` macros by the new macro `CHK`.
+
 ### Version 0.3
 
 - Add the `s3dut_create_thin_cylinder` function that creates a triangulated
   cylinder. Both ends can be closed or left open.
-
 - Add the `s3dut_create_thick_cylinder` function that creates a thick
   triangulated cylinder. Both ends can be closed or left open.
-
 - Add the `s3dut_create_truncated_sphere` function that creates a triangulated
   UV sphere (possibly) truncated along the Z axis. Truncated ends can be closed
   or left open.
-
 - Add the `s3dut_create_thick_truncated_sphere` function that creates a thick
   triangulated UV sphere (possibly) truncated along the Z axis. Truncated ends
   can be closed or left open.
- 
 - Add the `s3dut_create_super_shape` function that creates a triangulated super
   shape.
- 
 - Add the `s3dut_create_thick_truncated_super_shape` function that creates a
   thick triangulated super shape (possibly) truncated along the Z axis.
   Truncated ends can be closed or left open.
-  
 - Increase min number of slices for `s3dut_create_hemisphere` from 2 to 3.
  
 ### Version 0.2
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -24,8 +24,8 @@ set(S3DUT_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../src)
 ################################################################################
 # Dependencies
 ################################################################################
-find_package(RCMake REQUIRED)
-find_package(RSys 0.4 REQUIRED)
+find_package(RCMake 0.4 REQUIRED)
+find_package(RSys 0.6 REQUIRED)
 
 include_directories(${RSys_INCLUDE_DIR})
 
@@ -38,7 +38,7 @@ include(rcmake_runtime)
 ################################################################################
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 3)
-set(VERSION_PATCH 0)
+set(VERSION_PATCH 1)
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 
 set(S3DUT_FILES_SRC
diff --git a/src/test_s3dut_cuboid.c b/src/test_s3dut_cuboid.c
@@ -24,42 +24,42 @@ main(int argc, char** argv)
   struct s3dut_mesh_data data;
   (void)argc, (void)argv;
 
-  CHECK(mem_init_proxy_allocator(&allocator, &mem_default_allocator), RES_OK);
+  CHK(mem_init_proxy_allocator(&allocator, &mem_default_allocator) == RES_OK);
 
-  CHECK(s3dut_create_cuboid(NULL, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cuboid(NULL, 1, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cuboid(NULL, 0, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cuboid(NULL, 1, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cuboid(NULL, 0, 0, 1, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cuboid(NULL, 1, 0, 1, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cuboid(NULL, 0, 1, 1, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cuboid(NULL, 1, 1, 1, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cuboid(NULL, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cuboid(NULL, 1, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cuboid(NULL, 0, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cuboid(NULL, 1, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cuboid(NULL, 0, 0, 1, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cuboid(NULL, 1, 0, 1, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cuboid(NULL, 0, 1, 1, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cuboid(NULL, 1, 1, 1, &msh), RES_OK);
+  CHK(s3dut_create_cuboid(NULL, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cuboid(NULL, 1, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cuboid(NULL, 0, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cuboid(NULL, 1, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cuboid(NULL, 0, 0, 1, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cuboid(NULL, 1, 0, 1, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cuboid(NULL, 0, 1, 1, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cuboid(NULL, 1, 1, 1, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cuboid(NULL, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cuboid(NULL, 1, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cuboid(NULL, 0, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cuboid(NULL, 1, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cuboid(NULL, 0, 0, 1, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cuboid(NULL, 1, 0, 1, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cuboid(NULL, 0, 1, 1, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cuboid(NULL, 1, 1, 1, &msh) == RES_OK);
 
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
-  CHECK(s3dut_create_cuboid(&allocator, 1, 1, 2, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_create_cuboid(&allocator, 1, 1, 2, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
-  CHECK(s3dut_create_cuboid(&allocator,-1, 1, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cuboid(&allocator, 1,-1, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cuboid(&allocator, 1, 1,-2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cuboid(&allocator, 1, 1, 2, &msh), RES_OK);
+  CHK(s3dut_create_cuboid(&allocator,-1, 1, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cuboid(&allocator, 1,-1, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cuboid(&allocator, 1, 1,-2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cuboid(&allocator, 1, 1, 2, &msh) == RES_OK);
 
-  CHECK(s3dut_mesh_get_data(msh, &data), RES_OK);
+  CHK(s3dut_mesh_get_data(msh, &data) == RES_OK);
   dump_mesh_data(stdout, &data);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
   check_memory_allocator(&allocator);
   mem_shutdown_proxy_allocator(&allocator);
-  CHECK(mem_allocated_size(), 0);
+  CHK(mem_allocated_size() == 0);
   return 0;
 }
 
diff --git a/src/test_s3dut_cylinder.c b/src/test_s3dut_cylinder.c
@@ -24,59 +24,59 @@ main(int argc, char** argv)
   struct s3dut_mesh_data data;
   (void)argc, (void)argv;
 
-  CHECK(mem_init_proxy_allocator(&allocator, &mem_default_allocator), RES_OK);
+  CHK(mem_init_proxy_allocator(&allocator, &mem_default_allocator) == RES_OK);
 
-  CHECK(s3dut_create_cylinder(NULL, 0, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 1, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 0, 1, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 1, 1, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 0, 0, 3, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 1, 0, 3, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 0, 1, 3, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 1, 1, 3, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 0, 0, 0, 1, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 1, 0, 0, 1, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 0, 1, 0, 1, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 1, 1, 0, 1, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 0, 0, 3, 1, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 1, 0, 3, 1, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 0, 1, 3, 1, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 1, 1, 3, 1, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 0, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 1, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 0, 1, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 1, 1, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 0, 0, 3, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 1, 0, 3, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 0, 1, 3, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 1, 1, 3, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 0, 0, 0, 1, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 1, 0, 0, 1, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 0, 1, 0, 1, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 1, 1, 0, 1, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 0, 0, 3, 1, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 1, 0, 3, 1, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 0, 1, 3, 1, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(NULL, 1, 1, 3, 1, &msh), RES_OK);
+  CHK(s3dut_create_cylinder(NULL, 0, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 1, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 0, 1, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 1, 1, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 0, 0, 3, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 1, 0, 3, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 0, 1, 3, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 1, 1, 3, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 0, 0, 0, 1, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 1, 0, 0, 1, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 0, 1, 0, 1, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 1, 1, 0, 1, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 0, 0, 3, 1, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 1, 0, 3, 1, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 0, 1, 3, 1, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 1, 1, 3, 1, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 0, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 1, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 0, 1, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 1, 1, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 0, 0, 3, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 1, 0, 3, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 0, 1, 3, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 1, 1, 3, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 0, 0, 0, 1, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 1, 0, 0, 1, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 0, 1, 0, 1, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 1, 1, 0, 1, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 0, 0, 3, 1, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 1, 0, 3, 1, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 0, 1, 3, 1, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(NULL, 1, 1, 3, 1, &msh) == RES_OK);
 
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
-  CHECK(s3dut_create_cylinder(&allocator, 1, 1, 3, 1, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_create_cylinder(&allocator, 1, 1, 3, 1, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
-  CHECK(s3dut_create_cylinder(&allocator, -1, 1, 3, 1, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(&allocator, 1, -1, 3, 1, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(&allocator, 1, 1, 2, 1, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(&allocator, 1, 1, 3, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_cylinder(&allocator, 1, 2, 16, 4, &msh), RES_OK);
+  CHK(s3dut_create_cylinder(&allocator, -1, 1, 3, 1, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(&allocator, 1, -1, 3, 1, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(&allocator, 1, 1, 2, 1, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(&allocator, 1, 1, 3, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_cylinder(&allocator, 1, 2, 16, 4, &msh) == RES_OK);
 
-  CHECK(s3dut_mesh_get_data(msh, &data), RES_OK);
+  CHK(s3dut_mesh_get_data(msh, &data) == RES_OK);
   dump_mesh_data(stdout, &data);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
   check_memory_allocator(&allocator);
   mem_shutdown_proxy_allocator(&allocator);
-  CHECK(mem_allocated_size(), 0);
+  CHK(mem_allocated_size() == 0);
   return 0;
 }
 
diff --git a/src/test_s3dut_hemisphere.c b/src/test_s3dut_hemisphere.c
@@ -28,62 +28,62 @@ main(int argc, char** argv)
   size_t i;
   (void)argc, (void)argv;
 
-  CHECK(mem_init_proxy_allocator(&allocator, &mem_default_allocator), RES_OK);
+  CHK(mem_init_proxy_allocator(&allocator, &mem_default_allocator) == RES_OK);
 
-  CHECK(s3dut_create_hemisphere(NULL, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_hemisphere(NULL, 1, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_hemisphere(NULL, 0, 3, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_hemisphere(NULL, 1, 3, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_hemisphere(NULL, 0, 0, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_hemisphere(NULL, 1, 0, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_hemisphere(NULL, 0, 3, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_hemisphere(NULL, 1, 3, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_hemisphere(NULL, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_hemisphere(NULL, 1, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_hemisphere(NULL, 0, 3, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_hemisphere(NULL, 1, 3, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_hemisphere(NULL, 0, 0, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_hemisphere(NULL, 1, 0, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_hemisphere(NULL, 0, 3, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_hemisphere(NULL, 1, 3, 2, &msh), RES_OK);
+  CHK(s3dut_create_hemisphere(NULL, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_hemisphere(NULL, 1, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_hemisphere(NULL, 0, 3, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_hemisphere(NULL, 1, 3, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_hemisphere(NULL, 0, 0, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_hemisphere(NULL, 1, 0, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_hemisphere(NULL, 0, 3, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_hemisphere(NULL, 1, 3, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_hemisphere(NULL, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_hemisphere(NULL, 1, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_hemisphere(NULL, 0, 3, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_hemisphere(NULL, 1, 3, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_hemisphere(NULL, 0, 0, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_hemisphere(NULL, 1, 0, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_hemisphere(NULL, 0, 3, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_hemisphere(NULL, 1, 3, 2, &msh) == RES_OK);
 
-  CHECK(s3dut_mesh_ref_get(NULL), RES_BAD_ARG);
-  CHECK(s3dut_mesh_ref_get(msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(NULL), RES_BAD_ARG);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_mesh_ref_get(NULL) == RES_BAD_ARG);
+  CHK(s3dut_mesh_ref_get(msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(NULL) == RES_BAD_ARG);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
-  CHECK(s3dut_create_hemisphere(&allocator, 1, 3, 2, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_create_hemisphere(&allocator, 1, 3, 2, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
-  CHECK(s3dut_create_hemisphere(&allocator, 1, 1, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_hemisphere(&allocator, 1, 3, 1, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_hemisphere(&allocator,-1, 3, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_hemisphere(&allocator, 1, 32, 16, &msh), RES_OK);
+  CHK(s3dut_create_hemisphere(&allocator, 1, 1, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_hemisphere(&allocator, 1, 3, 1, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_hemisphere(&allocator,-1, 3, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_hemisphere(&allocator, 1, 32, 16, &msh) == RES_OK);
 
-  CHECK(s3dut_mesh_get_data(NULL, NULL), RES_BAD_ARG);
-  CHECK(s3dut_mesh_get_data(msh, NULL), RES_BAD_ARG);
-  CHECK(s3dut_mesh_get_data(NULL, &data), RES_BAD_ARG);
-  CHECK(s3dut_mesh_get_data(msh, &data), RES_OK);
-  NCHECK(data.positions, NULL);
-  NCHECK(data.indices, NULL);
-  CHECK(data.nvertices >= (32*(16-1)+1), 1);
-  CHECK(data.nprimitives, (32*(16-1)*2) + 32);
+  CHK(s3dut_mesh_get_data(NULL, NULL) == RES_BAD_ARG);
+  CHK(s3dut_mesh_get_data(msh, NULL) == RES_BAD_ARG);
+  CHK(s3dut_mesh_get_data(NULL, &data) == RES_BAD_ARG);
+  CHK(s3dut_mesh_get_data(msh, &data) == RES_OK);
+  CHK(data.positions != NULL);
+  CHK(data.indices != NULL);
+  CHK(data.nvertices >= (32*(16-1)+1));
+  CHK(data.nprimitives == (32*(16-1)*2) + 32);
 
   FOR_EACH(i, 0, data.nvertices) {
     double v[3];
     d3_set(v, data.positions + i*3);
     v[2] = sqrt(MMAX(0, 1 - v[0]*v[0] - v[1]*v[1]));
-    CHECK(d3_eq_eps(v, data.positions + i*3, 1.e-6), 1);
+    CHK(d3_eq_eps(v, data.positions + i*3, 1.e-6) == 1);
   }
 
   dump_mesh_data(stdout, &data);
 
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
   check_memory_allocator(&allocator);
   mem_shutdown_proxy_allocator(&allocator);
-  CHECK(mem_allocated_size(), 0);
+  CHK(mem_allocated_size() == 0);
   return 0;
 }
 
diff --git a/src/test_s3dut_sphere.c b/src/test_s3dut_sphere.c
@@ -24,55 +24,55 @@ main(int argc, char** argv)
   struct s3dut_mesh_data data;
   (void)argc, (void)argv;
 
-  CHECK(mem_init_proxy_allocator(&allocator, &mem_default_allocator), RES_OK);
+  CHK(mem_init_proxy_allocator(&allocator, &mem_default_allocator) == RES_OK);
 
-  CHECK(s3dut_create_sphere(NULL, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_sphere(NULL, 1, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_sphere(NULL, 0, 3, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_sphere(NULL, 1, 3, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_sphere(NULL, 0, 0, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_sphere(NULL, 1, 0, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_sphere(NULL, 0, 3, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_sphere(NULL, 1, 3, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_sphere(NULL, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_sphere(NULL, 1, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_sphere(NULL, 0, 3, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_sphere(NULL, 1, 3, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_sphere(NULL, 0, 0, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_sphere(NULL, 1, 0, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_sphere(NULL, 0, 3, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_sphere(NULL, 1, 3, 2, &msh), RES_OK);
+  CHK(s3dut_create_sphere(NULL, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_sphere(NULL, 1, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_sphere(NULL, 0, 3, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_sphere(NULL, 1, 3, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_sphere(NULL, 0, 0, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_sphere(NULL, 1, 0, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_sphere(NULL, 0, 3, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_sphere(NULL, 1, 3, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_sphere(NULL, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_sphere(NULL, 1, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_sphere(NULL, 0, 3, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_sphere(NULL, 1, 3, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_sphere(NULL, 0, 0, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_sphere(NULL, 1, 0, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_sphere(NULL, 0, 3, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_sphere(NULL, 1, 3, 2, &msh) == RES_OK);
 
-  CHECK(s3dut_mesh_ref_get(NULL), RES_BAD_ARG);
-  CHECK(s3dut_mesh_ref_get(msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(NULL), RES_BAD_ARG);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_mesh_ref_get(NULL) == RES_BAD_ARG);
+  CHK(s3dut_mesh_ref_get(msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(NULL) == RES_BAD_ARG);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
-  CHECK(s3dut_create_sphere(&allocator, 1, 3, 2, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_create_sphere(&allocator, 1, 3, 2, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
-  CHECK(s3dut_create_sphere(&allocator, 1, 2, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_sphere(&allocator, 1, 3, 1, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_sphere(&allocator,-1, 3, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_sphere(&allocator, 1, 32, 16, &msh), RES_OK);
+  CHK(s3dut_create_sphere(&allocator, 1, 2, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_sphere(&allocator, 1, 3, 1, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_sphere(&allocator,-1, 3, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_sphere(&allocator, 1, 32, 16, &msh) == RES_OK);
 
-  CHECK(s3dut_mesh_get_data(NULL, NULL), RES_BAD_ARG);
-  CHECK(s3dut_mesh_get_data(msh, NULL), RES_BAD_ARG);
-  CHECK(s3dut_mesh_get_data(NULL, &data), RES_BAD_ARG);
-  CHECK(s3dut_mesh_get_data(msh, &data), RES_OK);
-  NCHECK(data.positions, NULL);
-  NCHECK(data.indices, NULL);
-  CHECK(data.nvertices >= (32*(16-1)+2), 1);
-  CHECK(data.nprimitives, (32*(16-2)*2) + 2*32);
+  CHK(s3dut_mesh_get_data(NULL, NULL) == RES_BAD_ARG);
+  CHK(s3dut_mesh_get_data(msh, NULL) == RES_BAD_ARG);
+  CHK(s3dut_mesh_get_data(NULL, &data) == RES_BAD_ARG);
+  CHK(s3dut_mesh_get_data(msh, &data) == RES_OK);
+  CHK(data.positions != NULL);
+  CHK(data.indices != NULL);
+  CHK(data.nvertices >= (32*(16-1)+2));
+  CHK(data.nprimitives == (32*(16-2)*2) + 2*32);
 
   dump_mesh_data(stdout, &data);
 
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
   check_memory_allocator(&allocator);
   mem_shutdown_proxy_allocator(&allocator);
-  CHECK(mem_allocated_size(), 0);
+  CHK(mem_allocated_size() == 0);
   return 0;
 }
 
diff --git a/src/test_s3dut_super_shape.c b/src/test_s3dut_super_shape.c
@@ -25,95 +25,95 @@ main(int argc, char** argv)
   struct s3dut_super_formula f0, f1;
   (void)argc, (void)argv;
 
-  CHECK(mem_init_proxy_allocator(&allocator, &mem_default_allocator), RES_OK);
+  CHK(mem_init_proxy_allocator(&allocator, &mem_default_allocator) == RES_OK);
 
   f0.A = 1; f0.B = 1; f0.M = 5; f0.N0 = 1; f0.N1 = 1; f0.N2 = 2;
   f1.A = 1; f1.B = 1; f1.M = 5; f1.N0 = 1; f1.N1 = 1; f1.N2 = 3;
 
-  CHECK(s3dut_create_super_shape(NULL, NULL, NULL, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, NULL, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, &f1, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, &f1, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, NULL, 1, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, NULL, 1, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, &f1, 1, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, &f1, 1, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, NULL, 0, 3, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, NULL, 0, 3, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, &f1, 0, 3, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, &f1, 0, 3, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, NULL, 1, 3, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, NULL, 1, 3, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, &f1, 1, 3, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, &f1, 1, 3, 0, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, NULL, 0, 0, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, NULL, 0, 0, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, &f1, 0, 0, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, &f1, 0, 0, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, NULL, 1, 0, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, NULL, 1, 0, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, &f1, 1, 0, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, &f1, 1, 0, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, NULL, 0, 3, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, NULL, 0, 3, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, &f1, 0, 3, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, &f1, 0, 3, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, NULL, 1, 3, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, NULL, 1, 3, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, &f1, 1, 3, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, &f1, 1, 3, 2, NULL), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, NULL, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, NULL, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, &f1, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, &f1, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, NULL, 1, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, NULL, 1, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, &f1, 1, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, &f1, 1, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, NULL, 0, 3, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, NULL, 0, 3, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, &f1, 0, 3, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, &f1, 0, 3, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, NULL, 1, 3, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, NULL, 1, 3, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, &f1, 1, 3, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, &f1, 1, 3, 0, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, NULL, 0, 0, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, NULL, 0, 0, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, &f1, 0, 0, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, &f1, 0, 0, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, NULL, 1, 0, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, NULL, 1, 0, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, &f1, 1, 0, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, &f1, 1, 0, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, NULL, 0, 3, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, NULL, 0, 3, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, &f1, 0, 3, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, &f1, 0, 3, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, NULL, 1, 3, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, NULL, 1, 3, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, NULL, &f1, 1, 3, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(NULL, &f0, &f1, 1, 3, 2, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_create_super_shape(NULL, NULL, NULL, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, NULL, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, &f1, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, &f1, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, NULL, 1, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, NULL, 1, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, &f1, 1, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, &f1, 1, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, NULL, 0, 3, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, NULL, 0, 3, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, &f1, 0, 3, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, &f1, 0, 3, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, NULL, 1, 3, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, NULL, 1, 3, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, &f1, 1, 3, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, &f1, 1, 3, 0, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, NULL, 0, 0, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, NULL, 0, 0, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, &f1, 0, 0, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, &f1, 0, 0, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, NULL, 1, 0, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, NULL, 1, 0, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, &f1, 1, 0, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, &f1, 1, 0, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, NULL, 0, 3, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, NULL, 0, 3, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, &f1, 0, 3, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, &f1, 0, 3, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, NULL, 1, 3, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, NULL, 1, 3, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, &f1, 1, 3, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, &f1, 1, 3, 2, NULL) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, NULL, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, NULL, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, &f1, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, &f1, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, NULL, 1, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, NULL, 1, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, &f1, 1, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, &f1, 1, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, NULL, 0, 3, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, NULL, 0, 3, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, &f1, 0, 3, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, &f1, 0, 3, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, NULL, 1, 3, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, NULL, 1, 3, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, &f1, 1, 3, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, &f1, 1, 3, 0, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, NULL, 0, 0, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, NULL, 0, 0, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, &f1, 0, 0, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, &f1, 0, 0, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, NULL, 1, 0, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, NULL, 1, 0, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, &f1, 1, 0, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, &f1, 1, 0, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, NULL, 0, 3, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, NULL, 0, 3, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, &f1, 0, 3, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, &f1, 0, 3, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, NULL, 1, 3, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, NULL, 1, 3, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, NULL, &f1, 1, 3, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(NULL, &f0, &f1, 1, 3, 2, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
-  CHECK(s3dut_create_super_shape(&allocator, &f0, &f1, 1, 3, 2, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_create_super_shape(&allocator, &f0, &f1, 1, 3, 2, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
-  CHECK(s3dut_create_super_shape(&allocator, &f0, &f1, 1, 2, 2, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(&allocator, &f0, &f1, 1, 3, 1, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(&allocator, &f0, &f1,-1, 3, 1, &msh), RES_BAD_ARG);
-  CHECK(s3dut_create_super_shape(&allocator, &f0, &f1, 1, 32, 16, &msh), RES_OK);
+  CHK(s3dut_create_super_shape(&allocator, &f0, &f1, 1, 2, 2, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(&allocator, &f0, &f1, 1, 3, 1, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(&allocator, &f0, &f1,-1, 3, 1, &msh) == RES_BAD_ARG);
+  CHK(s3dut_create_super_shape(&allocator, &f0, &f1, 1, 32, 16, &msh) == RES_OK);
 
-  CHECK(s3dut_mesh_get_data(msh, &data), RES_OK);
-  NCHECK(data.positions, NULL);
-  NCHECK(data.indices, NULL);
+  CHK(s3dut_mesh_get_data(msh, &data) == RES_OK);
+  CHK(data.positions != NULL);
+  CHK(data.indices != NULL);
 
   dump_mesh_data(stdout, &data);
 
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
   check_memory_allocator(&allocator);
   mem_shutdown_proxy_allocator(&allocator);
-  CHECK(mem_allocated_size(), 0);
+  CHK(mem_allocated_size() == 0);
   return 0;
 }
diff --git a/src/test_s3dut_thick_cylinder.c b/src/test_s3dut_thick_cylinder.c
@@ -24,100 +24,100 @@ main(int argc, char** argv)
   struct s3dut_mesh_data data;
   (void)argc, (void)argv;
 
-  CHECK(mem_init_proxy_allocator(&allocator, &mem_default_allocator), RES_OK);
+  CHK(mem_init_proxy_allocator(&allocator, &mem_default_allocator) == RES_OK);
   #define CR_CYL s3dut_create_thick_cylinder
-  CHECK(CR_CYL(NULL, 0, 0, 0, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 0, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 0, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 0, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 0.1, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 0.1, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 0.1, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 0.1, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 0, 3, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 0, 3, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 0, 3, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 0, 3, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 0.1, 3, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 0.1, 3, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 0.1, 3, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 0.1, 3, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 0, 0, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 0, 0, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 0, 0, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 0, 0, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 0.1, 0, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 0.1, 0, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 0.1, 0, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 0.1, 0, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 0, 3, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 0, 3, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 0, 3, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 0, 3, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 0.1, 3, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 0.1, 3, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 0.1, 3, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 0.1, 3, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 0, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 0, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 0, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 0, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 0.1, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 0.1, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 0.1, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 0.1, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 0, 3, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 0, 3, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 0, 3, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 0, 3, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 0.1, 3, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 0.1, 3, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 0.1, 3, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 0.1, 3, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 0, 0, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 0, 0, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 0, 0, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 0, 0, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 0.1, 0, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 0.1, 0, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 0.1, 0, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 0.1, 0, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 0, 3, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 0, 3, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 0, 3, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 0, 3, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 0.1, 3, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 0.1, 3, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 0.1, 3, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 0.1, 3, 1, 0, &msh), RES_OK);
+  CHK(CR_CYL(NULL, 0, 0, 0, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 0, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 0, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 0, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 0.1, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 0.1, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 0.1, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 0.1, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 0, 3, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 0, 3, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 0, 3, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 0, 3, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 0.1, 3, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 0.1, 3, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 0.1, 3, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 0.1, 3, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 0, 0, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 0, 0, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 0, 0, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 0, 0, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 0.1, 0, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 0.1, 0, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 0.1, 0, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 0.1, 0, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 0, 3, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 0, 3, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 0, 3, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 0, 3, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 0.1, 3, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 0.1, 3, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 0.1, 3, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 0.1, 3, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 0, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 0, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 0, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 0, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 0.1, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 0.1, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 0.1, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 0.1, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 0, 3, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 0, 3, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 0, 3, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 0, 3, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 0.1, 3, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 0.1, 3, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 0.1, 3, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 0.1, 3, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 0, 0, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 0, 0, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 0, 0, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 0, 0, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 0.1, 0, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 0.1, 0, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 0.1, 0, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 0.1, 0, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 0, 3, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 0, 3, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 0, 3, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 0, 3, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 0.1, 3, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 0.1, 3, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 0.1, 3, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 0.1, 3, 1, 0, &msh) == RES_OK);
 
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
-  CHECK(CR_CYL(&allocator, 1, 1, 0.1, 3, 1, 0, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(CR_CYL(&allocator, 1, 1, 0.1, 3, 1, 0, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
-  CHECK(CR_CYL(&allocator,-1, 1, 0.1, 3, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(&allocator, 1,-1, 0.1, 3, 1, 0, &msh), RES_BAD_ARG);
+  CHK(CR_CYL(&allocator,-1, 1, 0.1, 3, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(&allocator, 1,-1, 0.1, 3, 1, 0, &msh) == RES_BAD_ARG);
 
-  CHECK(CR_CYL(&allocator, 1, 1, -0.1, 3, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(&allocator, 1, 1, 1, 3, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(&allocator, 2, 1, 0.5, 3, 1, 
-    S3DUT_CAP_POS_Z| S3DUT_CAP_NEG_Z, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(&allocator, 2, 0.5, 0.5, 3, 1, S3DUT_CAP_POS_Z, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(&allocator, 2, 0.5, 0.5, 3, 1, S3DUT_CAP_NEG_Z, &msh), RES_BAD_ARG);
+  CHK(CR_CYL(&allocator, 1, 1, -0.1, 3, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(&allocator, 1, 1, 1, 3, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(&allocator, 2, 1, 0.5, 3, 1, 
+    S3DUT_CAP_POS_Z| S3DUT_CAP_NEG_Z, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(&allocator, 2, 0.5, 0.5, 3, 1, S3DUT_CAP_POS_Z, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(&allocator, 2, 0.5, 0.5, 3, 1, S3DUT_CAP_NEG_Z, &msh) == RES_BAD_ARG);
 
-  CHECK(CR_CYL(&allocator, 1, 1, 0.1, 2, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(&allocator, 1, 1, 0.1, 3, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(&allocator, 1, 2, 0.1, 16, 4, S3DUT_CAP_POS_Z, &msh), RES_OK);
+  CHK(CR_CYL(&allocator, 1, 1, 0.1, 2, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(&allocator, 1, 1, 0.1, 3, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(&allocator, 1, 2, 0.1, 16, 4, S3DUT_CAP_POS_Z, &msh) == RES_OK);
  #undef CR_CYL
 
-  CHECK(s3dut_mesh_get_data(msh, &data), RES_OK);
+  CHK(s3dut_mesh_get_data(msh, &data) == RES_OK);
   dump_mesh_data(stdout, &data);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
   check_memory_allocator(&allocator);
   mem_shutdown_proxy_allocator(&allocator);
-  CHECK(mem_allocated_size(), 0);
+  CHK(mem_allocated_size() == 0);
   return 0;
 }
 
diff --git a/src/test_s3dut_thick_truncated_sphere.c b/src/test_s3dut_thick_truncated_sphere.c
@@ -28,87 +28,87 @@ main(int argc, char** argv)
   double z_range[2];
   (void)argc, (void)argv;
 
-  CHECK(mem_init_proxy_allocator(&allocator, &mem_default_allocator), RES_OK);
+  CHK(mem_init_proxy_allocator(&allocator, &mem_default_allocator) == RES_OK);
 
   #define CR_SPH s3dut_create_thick_truncated_sphere
 
-  CHECK(CR_SPH(NULL, 0, 0, 2, 1, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 1, 0, 2, 1, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 0, 0.1, 2, 1, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 1, 0.1, 2, 1, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 0, 0, 3, 1, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 1, 0, 3, 1, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 0, 0.1, 3, 1, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 1, 0.1, 3, 1, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 0, 0, 2, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 1, 0, 2, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 0, 0.1, 2, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 1, 0.1, 2, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 0, 0, 3, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 1, 0, 3, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 0, 0.1, 3, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 1, 0.1, 3, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 0, 0, 2, 1, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 1, 0, 2, 1, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 0, 0.1, 2, 1, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 1, 0.1, 2, 1, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 0, 0, 3, 1, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 1, 0, 3, 1, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 0, 0.1, 3, 1, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 1, 0.1, 3, 1, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 0, 0, 2, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 1, 0, 2, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 0, 0.1, 2, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 1, 0.1, 2, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 0, 0, 3, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 1, 0, 3, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 0, 0.1, 3, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_SPH(NULL, 1, 0.1, 3, 2, NULL, 0, &msh), RES_OK);
-
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(CR_SPH(NULL, 0, 0, 2, 1, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 1, 0, 2, 1, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 0, 0.1, 2, 1, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 1, 0.1, 2, 1, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 0, 0, 3, 1, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 1, 0, 3, 1, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 0, 0.1, 3, 1, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 1, 0.1, 3, 1, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 0, 0, 2, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 1, 0, 2, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 0, 0.1, 2, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 1, 0.1, 2, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 0, 0, 3, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 1, 0, 3, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 0, 0.1, 3, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 1, 0.1, 3, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 0, 0, 2, 1, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 1, 0, 2, 1, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 0, 0.1, 2, 1, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 1, 0.1, 2, 1, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 0, 0, 3, 1, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 1, 0, 3, 1, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 0, 0.1, 3, 1, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 1, 0.1, 3, 1, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 0, 0, 2, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 1, 0, 2, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 0, 0.1, 2, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 1, 0.1, 2, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 0, 0, 3, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 1, 0, 3, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 0, 0.1, 3, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_SPH(NULL, 1, 0.1, 3, 2, NULL, 0, &msh) == RES_OK);
+
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
   z_range[0] = -0.8;
   z_range[1] = -0.1;
-  CHECK(CR_SPH(&allocator, 1, 0.1, 16, 8, z_range, S3DUT_CAP_NEG_Z, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(CR_SPH(&allocator, 1, 0.1, 16, 8, z_range, S3DUT_CAP_NEG_Z, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
-  CHECK(CR_SPH(&allocator, 1, 0.1, 16, 8, z_range, S3DUT_CAP_POS_Z, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(CR_SPH(&allocator, 1, 0.1, 16, 8, z_range, S3DUT_CAP_POS_Z, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
-  CHECK(CR_SPH(&allocator, 1, 0.1, 16, 8, z_range,
-    S3DUT_CAP_POS_Z | S3DUT_CAP_NEG_Z, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(CR_SPH(&allocator, 1, 0.1, 16, 8, z_range,
+    S3DUT_CAP_POS_Z | S3DUT_CAP_NEG_Z, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
   z_range[0] = 0;
   z_range[1] = 0.8;
-  CHECK(CR_SPH(&allocator, 1, 0.1, 16, 8, z_range, 0, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(CR_SPH(&allocator, 1, 0.1, 16, 8, z_range, 0, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
   z_range[0] = 0;
   z_range[1] = 2;
-  CHECK(CR_SPH(&allocator, 1, 0.1, 16, 8, z_range, 0, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(CR_SPH(&allocator, 1, 0.1, 16, 8, z_range, 0, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
   z_range[0] = -0.5;
   z_range[1] = -0.8;
-  CHECK(CR_SPH(&allocator, 1, 0.1, 16, 8, z_range, 0, &msh), RES_BAD_ARG);
+  CHK(CR_SPH(&allocator, 1, 0.1, 16, 8, z_range, 0, &msh) == RES_BAD_ARG);
 
   z_range[0] = 0;
   z_range[1] = 0.8;
-  CHECK(CR_SPH(&allocator, 1, 0.1, 16, 8, z_range, S3DUT_CAP_NEG_Z, &msh), RES_OK);
+  CHK(CR_SPH(&allocator, 1, 0.1, 16, 8, z_range, S3DUT_CAP_NEG_Z, &msh) == RES_OK);
 
-  CHECK(s3dut_mesh_get_data(msh, &data), RES_OK);
-  NCHECK(data.positions, NULL);
-  NCHECK(data.indices, NULL);
+  CHK(s3dut_mesh_get_data(msh, &data) == RES_OK);
+  CHK(data.positions != NULL);
+  CHK(data.indices != NULL);
   #undef CR_TS
 
   dump_mesh_data(stdout, &data);
 
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
   check_memory_allocator(&allocator);
   mem_shutdown_proxy_allocator(&allocator);
-  CHECK(mem_allocated_size(), 0);
+  CHK(mem_allocated_size() == 0);
   return 0;
 }
 
diff --git a/src/test_s3dut_thick_truncated_super_shape.c b/src/test_s3dut_thick_truncated_super_shape.c
@@ -26,160 +26,160 @@ main(int argc, char** argv)
   double z_range[2];
   (void)argc, (void)argv;
 
-  CHECK(mem_init_proxy_allocator(&allocator, &mem_default_allocator), RES_OK);
+  CHK(mem_init_proxy_allocator(&allocator, &mem_default_allocator) == RES_OK);
 
   f0.A = 1; f0.B = 1; f0.M = 5; f0.N0 = 1; f0.N1 = 1; f0.N2 = 2;
   f1.A = 1; f1.B = 1; f1.M = 5; f1.N0 = 1; f1.N1 = 1; f1.N2 = 3;
 
   #define CREATE s3dut_create_thick_truncated_super_shape
-  CHECK(CREATE(NULL, NULL, NULL, 0, -1, 0, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 0, -1, 0, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 0, -1, 0, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 0, -1, 0, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 1, -1, 0, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 1, -1, 0, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 1, -1, 0, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 1, -1, 0, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 0, 0, 0, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 0, 0, 0, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 0, 0, 0, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 0, 0, 0, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 1, 0, 0, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 1, 0, 0, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 1, 0, 0, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 1, 0, 0, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 0, -1, 3, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 0, -1, 3, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 0, -1, 3, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 0, -1, 3, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 1, -1, 3, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 1, -1, 3, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 1, -1, 3, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 1, -1, 3, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 0, 0, 3, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 0, 0, 3, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 0, 0, 3, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 0, 0, 3, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 1, 0, 3, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 1, 0, 3, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 1, 0, 3, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 1, 0, 3, 0, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 0, -1, 0, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 0, -1, 0, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 0, -1, 0, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 0, -1, 0, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 1, -1, 0, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 1, -1, 0, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 1, -1, 0, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 1, -1, 0, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 0, 0, 0, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 0, 0, 0, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 0, 0, 0, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 0, 0, 0, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 1, 0, 0, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 1, 0, 0, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 1, 0, 0, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 1, 0, 0, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 0, -1, 3, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 0, -1, 3, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 0, -1, 3, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 0, -1, 3, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 1, -1, 3, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 1, -1, 3, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 1, -1, 3, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 1, -1, 3, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 0, 0, 3, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 0, 0, 3, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 0, 0, 3, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 0, 0, 3, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 1, 0, 3, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 1, 0, 3, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 1, 0, 3, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 1, 0, 3, 2, NULL, 0, NULL), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 0, -1, 0, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 0, -1, 0, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 0, -1, 0, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 0, -1, 0, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 1, -1, 0, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 1, -1, 0, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 1, -1, 0, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 1, -1, 0, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 0, 0, 0, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 0, 0, 0, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 0, 0, 0, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 0, 0, 0, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 1, 0, 0, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 1, 0, 0, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 1, 0, 0, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 1, 0, 0, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 0, -1, 3, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 0, -1, 3, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 0, -1, 3, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 0, -1, 3, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 1, -1, 3, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 1, -1, 3, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 1, -1, 3, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 1, -1, 3, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 0, 0, 3, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 0, 0, 3, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 0, 0, 3, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 0, 0, 3, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 1, 0, 3, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 1, 0, 3, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 1, 0, 3, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 1, 0, 3, 0, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 0, -1, 0, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 0, -1, 0, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 0, -1, 0, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 0, -1, 0, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 1, -1, 0, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 1, -1, 0, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 1, -1, 0, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 1, -1, 0, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 0, 0, 0, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 0, 0, 0, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 0, 0, 0, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 0, 0, 0, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 1, 0, 0, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 1, 0, 0, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 1, 0, 0, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 1, 0, 0, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 0, -1, 3, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 0, -1, 3, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 0, -1, 3, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 0, -1, 3, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 1, -1, 3, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 1, -1, 3, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 1, -1, 3, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 1, -1, 3, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 0, 0, 3, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 0, 0, 3, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 0, 0, 3, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 0, 0, 3, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, NULL, 1, 0, 3, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, NULL, 1, 0, 3, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, NULL, &f1, 1, 0, 3, 2, NULL, 0, &msh), RES_BAD_ARG);
-  CHECK(CREATE(NULL, &f0, &f1, 1, 0, 3, 2, NULL, 0, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(CREATE(NULL, NULL, NULL, 0, -1, 0, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 0, -1, 0, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 0, -1, 0, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 0, -1, 0, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 1, -1, 0, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 1, -1, 0, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 1, -1, 0, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 1, -1, 0, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 0, 0, 0, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 0, 0, 0, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 0, 0, 0, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 0, 0, 0, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 1, 0, 0, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 1, 0, 0, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 1, 0, 0, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 1, 0, 0, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 0, -1, 3, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 0, -1, 3, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 0, -1, 3, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 0, -1, 3, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 1, -1, 3, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 1, -1, 3, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 1, -1, 3, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 1, -1, 3, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 0, 0, 3, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 0, 0, 3, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 0, 0, 3, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 0, 0, 3, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 1, 0, 3, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 1, 0, 3, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 1, 0, 3, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 1, 0, 3, 0, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 0, -1, 0, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 0, -1, 0, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 0, -1, 0, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 0, -1, 0, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 1, -1, 0, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 1, -1, 0, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 1, -1, 0, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 1, -1, 0, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 0, 0, 0, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 0, 0, 0, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 0, 0, 0, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 0, 0, 0, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 1, 0, 0, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 1, 0, 0, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 1, 0, 0, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 1, 0, 0, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 0, -1, 3, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 0, -1, 3, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 0, -1, 3, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 0, -1, 3, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 1, -1, 3, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 1, -1, 3, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 1, -1, 3, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 1, -1, 3, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 0, 0, 3, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 0, 0, 3, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 0, 0, 3, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 0, 0, 3, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 1, 0, 3, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 1, 0, 3, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 1, 0, 3, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 1, 0, 3, 2, NULL, 0, NULL) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 0, -1, 0, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 0, -1, 0, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 0, -1, 0, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 0, -1, 0, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 1, -1, 0, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 1, -1, 0, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 1, -1, 0, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 1, -1, 0, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 0, 0, 0, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 0, 0, 0, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 0, 0, 0, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 0, 0, 0, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 1, 0, 0, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 1, 0, 0, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 1, 0, 0, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 1, 0, 0, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 0, -1, 3, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 0, -1, 3, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 0, -1, 3, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 0, -1, 3, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 1, -1, 3, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 1, -1, 3, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 1, -1, 3, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 1, -1, 3, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 0, 0, 3, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 0, 0, 3, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 0, 0, 3, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 0, 0, 3, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 1, 0, 3, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 1, 0, 3, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 1, 0, 3, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 1, 0, 3, 0, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 0, -1, 0, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 0, -1, 0, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 0, -1, 0, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 0, -1, 0, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 1, -1, 0, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 1, -1, 0, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 1, -1, 0, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 1, -1, 0, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 0, 0, 0, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 0, 0, 0, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 0, 0, 0, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 0, 0, 0, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 1, 0, 0, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 1, 0, 0, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 1, 0, 0, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 1, 0, 0, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 0, -1, 3, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 0, -1, 3, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 0, -1, 3, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 0, -1, 3, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 1, -1, 3, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 1, -1, 3, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 1, -1, 3, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 1, -1, 3, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 0, 0, 3, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 0, 0, 3, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 0, 0, 3, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 0, 0, 3, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, NULL, 1, 0, 3, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, NULL, 1, 0, 3, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, NULL, &f1, 1, 0, 3, 2, NULL, 0, &msh) == RES_BAD_ARG);
+  CHK(CREATE(NULL, &f0, &f1, 1, 0, 3, 2, NULL, 0, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
-  CHECK(CREATE(&allocator, &f0, &f1, 1, 0, 3, 2, NULL, 0, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(CREATE(&allocator, &f0, &f1, 1, 0, 3, 2, NULL, 0, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
   z_range[0] = -0.1, z_range[1] = 0.5;
-  CHECK(CREATE(&allocator, &f0, &f1, 1, 0.3, 32, 16, z_range, S3DUT_CAP_NEG_Z,
-    &msh), RES_OK);
+  CHK(CREATE(&allocator, &f0, &f1, 1, 0.3, 32, 16, z_range, S3DUT_CAP_NEG_Z,
+    &msh) == RES_OK);
 
-  CHECK(s3dut_mesh_get_data(msh, &data), RES_OK);
-  NCHECK(data.positions, NULL);
-  NCHECK(data.indices, NULL);
+  CHK(s3dut_mesh_get_data(msh, &data) == RES_OK);
+  CHK(data.positions != NULL);
+  CHK(data.indices != NULL);
 
   dump_mesh_data(stdout, &data);
 
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
   check_memory_allocator(&allocator);
   mem_shutdown_proxy_allocator(&allocator);
-  CHECK(mem_allocated_size(), 0);
+  CHK(mem_allocated_size() == 0);
   return 0;
 }
 
diff --git a/src/test_s3dut_thin_cylinder.c b/src/test_s3dut_thin_cylinder.c
@@ -24,70 +24,70 @@ main(int argc, char** argv)
   struct s3dut_mesh_data data;
   (void)argc, (void)argv;
 
-  CHECK(mem_init_proxy_allocator(&allocator, &mem_default_allocator), RES_OK);
+  CHK(mem_init_proxy_allocator(&allocator, &mem_default_allocator) == RES_OK);
 
  #define CR_CYL s3dut_create_thin_cylinder
 
-  CHECK(CR_CYL(NULL, 0, 0, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 0, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 3, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 3, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 3, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 3, 0, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 0, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 0, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 0, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 0, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 3, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 3, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 3, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 3, 1, 0, NULL), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 0, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 3, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 3, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 3, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 3, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 0, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 0, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 0, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 0, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 0, 3, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 0, 3, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 0, 1, 3, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(NULL, 1, 1, 3, 1, 0, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(CR_CYL(NULL, 0, 0, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 0, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 3, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 3, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 3, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 3, 0, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 0, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 0, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 0, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 0, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 3, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 3, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 3, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 3, 1, 0, NULL) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 0, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 3, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 3, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 3, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 3, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 0, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 0, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 0, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 0, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 0, 3, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 0, 3, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 0, 1, 3, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(NULL, 1, 1, 3, 1, 0, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
-  CHECK(CR_CYL(&allocator, 1, 1, 3, 1, 0, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(CR_CYL(&allocator, 1, 1, 3, 1, 0, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
-  CHECK(CR_CYL(&allocator, 1, 1, 3, 1, 0, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
-  CHECK(CR_CYL(&allocator, 1, 1, 3, 1, S3DUT_CAP_POS_Z, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
-  CHECK(CR_CYL(&allocator, 1, 1, 3, 1, S3DUT_CAP_NEG_Z, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
-  CHECK(CR_CYL(&allocator, 1, 1, 3, 1,
-    S3DUT_CAP_POS_Z | S3DUT_CAP_NEG_Z, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(CR_CYL(&allocator, 1, 1, 3, 1, 0, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
+  CHK(CR_CYL(&allocator, 1, 1, 3, 1, S3DUT_CAP_POS_Z, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
+  CHK(CR_CYL(&allocator, 1, 1, 3, 1, S3DUT_CAP_NEG_Z, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
+  CHK(CR_CYL(&allocator, 1, 1, 3, 1,
+    S3DUT_CAP_POS_Z | S3DUT_CAP_NEG_Z, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
-  CHECK(CR_CYL(&allocator, -1, 1, 3, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(&allocator, 1, -1, 3, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(&allocator, 1, 1, 2, 1, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(&allocator, 1, 1, 3, 0, 0, &msh), RES_BAD_ARG);
-  CHECK(CR_CYL(&allocator, 1, 2, 16, 4, S3DUT_CAP_NEG_Z, &msh), RES_OK);
+  CHK(CR_CYL(&allocator, -1, 1, 3, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(&allocator, 1, -1, 3, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(&allocator, 1, 1, 2, 1, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(&allocator, 1, 1, 3, 0, 0, &msh) == RES_BAD_ARG);
+  CHK(CR_CYL(&allocator, 1, 2, 16, 4, S3DUT_CAP_NEG_Z, &msh) == RES_OK);
 
-  CHECK(s3dut_mesh_get_data(msh, &data), RES_OK);
+  CHK(s3dut_mesh_get_data(msh, &data) == RES_OK);
   dump_mesh_data(stdout, &data);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
   check_memory_allocator(&allocator);
   mem_shutdown_proxy_allocator(&allocator);
-  CHECK(mem_allocated_size(), 0);
+  CHK(mem_allocated_size() == 0);
   return 0;
 }
 
diff --git a/src/test_s3dut_truncated_sphere.c b/src/test_s3dut_truncated_sphere.c
@@ -28,38 +28,38 @@ main(int argc, char** argv)
   double z_range[2];
   (void)argc, (void)argv;
 
-  CHECK(mem_init_proxy_allocator(&allocator, &mem_default_allocator), RES_OK);
+  CHK(mem_init_proxy_allocator(&allocator, &mem_default_allocator) == RES_OK);
 
   #define CR_TS s3dut_create_truncated_sphere
   z_range[0] = z_range[1] = 0;
-  CHECK(CR_TS(NULL, 1, 16, 8, z_range, 0, &msh), RES_BAD_ARG);
+  CHK(CR_TS(NULL, 1, 16, 8, z_range, 0, &msh) == RES_BAD_ARG);
   z_range[1] = -0.5;
-  CHECK(CR_TS(NULL, 1, 16, 8, z_range, 0, &msh), RES_BAD_ARG);
+  CHK(CR_TS(NULL, 1, 16, 8, z_range, 0, &msh) == RES_BAD_ARG);
   z_range[1] = +0.5;
-  CHECK(CR_TS(NULL, 1, 16, 8, z_range, 0, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
-  CHECK(CR_TS(NULL, 1, 16, 8, NULL, 0, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(CR_TS(NULL, 1, 16, 8, z_range, 0, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
+  CHK(CR_TS(NULL, 1, 16, 8, NULL, 0, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
-  CHECK(CR_TS(&allocator, 1, 16, 8, NULL, 0, &msh), RES_OK);
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(CR_TS(&allocator, 1, 16, 8, NULL, 0, &msh) == RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
   z_range[0] = 0;
   z_range[1] = 0.9;
-  CHECK(CR_TS(&allocator, 1, 16, 8, z_range, S3DUT_CAP_NEG_Z, &msh), RES_OK);
+  CHK(CR_TS(&allocator, 1, 16, 8, z_range, S3DUT_CAP_NEG_Z, &msh) == RES_OK);
 
-  CHECK(s3dut_mesh_get_data(msh, &data), RES_OK);
-  NCHECK(data.positions, NULL);
-  NCHECK(data.indices, NULL);
+  CHK(s3dut_mesh_get_data(msh, &data) == RES_OK);
+  CHK(data.positions != NULL);
+  CHK(data.indices != NULL);
   #undef CR_TS
 
   dump_mesh_data(stdout, &data);
 
-  CHECK(s3dut_mesh_ref_put(msh), RES_OK);
+  CHK(s3dut_mesh_ref_put(msh) == RES_OK);
 
   check_memory_allocator(&allocator);
   mem_shutdown_proxy_allocator(&allocator);
-  CHECK(mem_allocated_size(), 0);
+  CHK(mem_allocated_size() == 0);
   return 0;
 }
 
diff --git a/src/test_s3dut_utils.h b/src/test_s3dut_utils.h
@@ -25,7 +25,7 @@ static INLINE void
 dump_mesh_data(FILE* stream, const struct s3dut_mesh_data* data)
 {
   size_t i;
-  NCHECK(data, NULL);
+  CHK(data != NULL);
 
   FOR_EACH(i, 0, data->nvertices) {
     fprintf(stream, "v %g %g %g\n", SPLIT3(data->positions + i*3));