star-cad

commit be81458490ffaa24028a0252d642317403574a3a
parent a2ce10e01260aee3865f1429d36f1561ce45cbac
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Wed, 23 Nov 2022 16:41:13 +0100

Remove useless tests

Diffstat:
M
src/scad.c
 | 
20
++++++++++++--------
M
src/scad_geometry.c
 | 
80
++++++++++++++++++++++++++++++++++++++++----------------------------------------

2 files changed, 52 insertions(+), 48 deletions(-)
diff --git a/src/scad.c b/src/scad.c
@@ -376,23 +376,23 @@ scad_stl_export
 
 exit:
   if(str_initialized) str_release(&filename);
-  if(allocated_dimTags) free(allocated_dimTags);
+  free(allocated_dimTags);
   if(nodeTags) {
     for(i = 0; i < faces_dimTags_n/2; i++) free(nodeTags[i]);
     free(nodeTags);
   }
-  if(nodeTags_n) free(nodeTags_n);
+  free(nodeTags_n);
   if(coord) {
     for(i = 0; i < faces_dimTags_n/2; i++) free(coord[i]);
     free(coord);
   }
-  if(coord_n) free(coord_n);
+  free(coord_n);
   if(pCoord) {
     for(i = 0; i < faces_dimTags_n/2; i++) free(pCoord[i]);
     free(pCoord);
   }
-  if(pCoord_n) free(pCoord_n);
-  if(dimTags) free(dimTags);
+  free(pCoord_n);
+  free(dimTags);
   return res;
 error:
   log_error(get_device(), "%s: could not export to STL -- %s\n",
@@ -452,6 +452,8 @@ scad_stl_export_split
   if(data[0] == 2) {
     FOR_EACH(i, 0, sz/2) {
       ASSERT(data[2*i] == 2);
+      /* When upgrading to gmsh 4.11 the additional arg. name cannot be NULL;
+       * use "" instead */
       group = gmshModelAddPhysicalGroup(2, &data[2*i+1], 1, -1, &ierr);
       ERR(gmsh_err_to_res_T(ierr));
       ERR(str_copy(&filename, &filename_root));
@@ -475,6 +477,8 @@ scad_stl_export_split
     ERR(gmsh_err_to_res_T(ierr));
 
     FOR_EACH(i, 0, tagoutn/2){
+      /* When upgrading to gmsh 4.11 the additional arg. name cannot be NULL;
+       * use "" instead */
       group = gmshModelAddPhysicalGroup(2, tagout + 2*i+1, 1, -1, &ierr);
       ERR(gmsh_err_to_res_T(ierr));
       ERR(str_copy(&filename, &filename_root));
@@ -494,7 +498,7 @@ exit:
     str_release(&filename_root);
     str_release(&filename);
   }
-  if(tagout) free(tagout);
+  free(tagout);
   return res;
 error:
   goto exit;
@@ -547,9 +551,9 @@ scad_scene_partition
   }
   gmshModelOccSynchronize(&ierr);
   ERR(gmsh_err_to_res_T(ierr));
- 
+
 exit:
-  if(dimTags) free(dimTags);
+  free(dimTags);
   return res;
 error:
   goto exit;
diff --git a/src/scad_geometry.c b/src/scad_geometry.c
@@ -106,14 +106,14 @@ error:
 static res_T
 scad_geometry_create
   (const char* name,
-   struct scad_geometry** out_geom)
+   struct scad_geometry** out_geometry)
 {
   res_T res = RES_OK;
   struct scad_geometry* geom = NULL;
   struct scad_device* dev = get_device();
   char one = 1;
 
-  ASSERT(out_geom);
+  ASSERT(out_geometry);
 
   geom = (struct scad_geometry*)MEM_CALLOC(dev->allocator, 1, sizeof(*geom));
   if(!geom) {
@@ -127,7 +127,7 @@ scad_geometry_create
   dev->need_synchro = 1;
 
 end:
-  if(out_geom) *out_geom = geom;
+  *out_geometry = geom;
   return res;
 error:
   if(geom) {
@@ -316,8 +316,8 @@ scad_geometry_get_name
   if(!geom || !name) goto error;
 
   ERR(check_device(FUNC_NAME));
- 
-  *name = malloc((strlen(str_cget(&geom->name)) + 1)*sizeof(char));  
+
+  *name = malloc((strlen(str_cget(&geom->name)) + 1)*sizeof(char));
   strcpy(*name, str_cget(&geom->name));
 
 exit:
@@ -346,7 +346,7 @@ scad_geometry_get_mass
   count = geom->gmsh_dimTags_n / 2;
 
   ERR(gather_tags(&geom, 1, SIZE_MAX, &data, &sz));
-  
+
   dim = data[0];
   *mass = 0;
   for (i=0; i<count; ++i) {
@@ -526,8 +526,8 @@ scad_add_polygon
 
 exit:
   if(out_geometry) *out_geometry = geom;
-  if(points) free(points);
-  if(lines) free(lines);
+  free(points);
+  free(lines);
   return res;
 error:
   if(geom) {
@@ -723,10 +723,10 @@ scad_fuse_geometries
 
 exit:
   if(out_geometry) *out_geometry = geom;
-  if(data1) free(data1);
-  if(data2) free(data2);
-  if(mapn) free(mapn);
-  if(map) free(map);
+  free(data1);
+  free(data2);
+  free(mapn);
+  free(map);
   return res;
 error:
   if(geom) {
@@ -787,10 +787,10 @@ scad_cut_geometries
 
 exit:
   if(out_geometry) *out_geometry = geom;
-  if(data1) free(data1);
-  if(data2) free(data2);
-  if(mapn) free(mapn);
-  if(map) free(map);
+  free(data1);
+  free(data2);
+  free(mapn);
+  free(map);
   return res;
 error:
   if(geom) {
@@ -851,10 +851,10 @@ scad_intersect_geometries
 
 exit:
   if(out_geometry) *out_geometry = geom;
-  if(data1) free(data1);
-  if(data2) free(data2);
-  if(mapn) free(mapn);
-  if(map) free(map);
+  free(data1);
+  free(data2);
+  free(mapn);
+  free(map);
   return res;
 error:
   if(geom) {
@@ -922,12 +922,12 @@ scad_geometries_common_boundaries
 
 exit:
   if(out_geometry) *out_geometry = geom;
-  if(data1) free(data1);
-  if(data2) free(data2);
-  if(bound1) free(bound1);
-  if(bound2) free(bound2);
-  if(mapn) free(mapn);
-  if(map) free(map);
+  free(data1);
+  free(data2);
+  free(bound1);
+  free(bound2);
+  free(mapn);
+  free(map);
   return res;
 error:
   if(geom) {
@@ -1005,7 +1005,7 @@ scad_geometry_extrude
   sz = geom->gmsh_dimTags_n;
   data = geom->gmsh_dimTags;
   gmshModelOccExtrude(data, sz, SPLIT3(dxdydz), &tagout, &tagoutn,
-      NULL, 0, NULL, 0, 0 , &ierr);
+      NULL, 0, NULL, 0, 0, &ierr);
   get_device()->need_synchro = 1;
   ERR(gmsh_err_to_res_T(ierr));
 
@@ -1036,7 +1036,7 @@ scad_geometry_extrude
 
 exit:
   if(out_geometry) *out_geometry = extrude_geom;
-  if(tagout) free(tagout);
+  free(tagout);
   return res;
 error:
   if(extrude_geom) {
@@ -1050,7 +1050,7 @@ res_T
 scad_geometry_explode
   (const struct scad_geometry* geom,
    const char* prefix_name, /* Can be NULL */
-   struct scad_geometry*** out_geometry, 
+   struct scad_geometry*** out_geometry,
    size_t* out_geometry_n)
 {
   res_T res = RES_OK;
@@ -1104,7 +1104,7 @@ scad_geometry_explode
 
     ERR(device_register_tags(geom_array[i]));
   }
-    
+
 exit:
   if(out_geometry_n) *out_geometry_n = sz/2 ;
   if(out_geometry) *out_geometry = geom_array;
@@ -1177,7 +1177,7 @@ scad_geometry_rename
 {
   res_T res = RES_OK;
 
-  if(!geom){
+  if(!geom) {
     res = RES_BAD_ARG;
     goto error;
   }
@@ -1445,10 +1445,10 @@ scad_fragment_geometries
 
 exit:
   if(out_geometry) *out_geometry = geom;
-  if(data1) free(data1);
-  if(data2) free(data2);
-  if(mapn) free(mapn);
-  if(map) free(map);
+  free(data1);
+  free(data2);
+  free(mapn);
+  free(map);
   return res;
 error:
   if(geom) {
@@ -1608,7 +1608,7 @@ scad_geometry_normal
     res = RES_BAD_ARG;
     goto error;
   }
-  
+
   ERR(check_device(FUNC_NAME));
 
   if (geom->gmsh_dimTags[0] == 2) {
@@ -1619,7 +1619,7 @@ scad_geometry_normal
     res = RES_BAD_ARG;
     goto error;
   }
-  
+
   ERR(gather_tags(&surface, 1, SIZE_MAX, &data, &sz));
 
   for (i=0; sz/2; ++i) {
@@ -1639,7 +1639,7 @@ scad_geometry_normal
           &coord, &coord_n,
           &ierr);
       ERR(gmsh_err_to_res_T(ierr));
-      
+
       if (d3_eq_eps(p, coord, 1e-6)) {
         gmshModelGetNormal(data[2*i + 1], pcoord, pcoord_n,
             &normals, &normals_n, &ierr);
@@ -1662,7 +1662,7 @@ scad_geometry_normal
 
 exit:
   *out_geometry = out;
-  if (data) free(data);
+  free(data);
   if (surface) scad_geometry_delete(surface);
   return res;
 error:
@@ -1684,7 +1684,7 @@ scad_geometry_dilate
     res = RES_BAD_ARG;
     goto error;
   }
-   
+
   ERR(check_device(FUNC_NAME));
 
   ERR(gather_tags(&geom, 1, SIZE_MAX, &data, &sz));