star-enclosures-2d

commit 4352235293235c0c53a6847a8182f0ef83d83467
parent 0074dd1030cc7230ca66f006dac00e0d5ac92953
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Fri,  6 Apr 2018 17:40:36 +0200

Small changes

Diffstat:
M
src/senc2d_descriptor.c
 | 
4
++--
M
src/senc2d_internal_types.h
 | 
23
++++++++++++++++-------
M
src/test_senc2d_utils.h
 | 
4
++--

3 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/senc2d_descriptor.c b/src/senc2d_descriptor.c
@@ -63,11 +63,11 @@ descriptor_create(struct senc2d_scene* scn)
     desc->segment_count = scn->nusegs;
     desc->vertices_count = scn->nuverts;
   }
-end:
+exit:
   return desc;
 error:
   if(desc) SENC2D(descriptor_ref_put(desc));
-  goto end;
+  goto exit;
 }
 
 struct mem_allocator*
diff --git a/src/senc2d_internal_types.h b/src/senc2d_internal_types.h
@@ -22,18 +22,27 @@
 
 /* Utility macros */
 #ifdef NDEBUG
-#define OK2(Expr, Label)\
-  if((res = (Expr)) != RES_OK) goto Label;
+#define OK2(Expr)\
+  if((tmp_res = (Expr)) != RES_OK) goto tmp_error;
+
+#define OK(Expr)\
+  if((res = (Expr)) != RES_OK) goto error;
 #else
-#define OK2(Expr, Label)\
+#define OK2(Expr)\
+  if((tmp_res = (Expr)) != RES_OK) {\
+    fprintf(stderr, "%s: error code set to %d at line %d\n", FUNC_NAME,\
+       tmp_res, __LINE__);\
+    goto tmp_error;\
+  }
+
+#define OK(Expr)\
   if((res = (Expr)) != RES_OK) {\
-    fprintf(stderr, "%s: error code set to %d at line %d\n", FUNC_NAME, res, __LINE__);\
-    goto Label;\
+    fprintf(stderr, "%s: error code set to %d at line %d\n", FUNC_NAME,\
+       res, __LINE__);\
+    goto error;\
   }
 #endif
 
-#define OK(Expr) OK2((Expr), error)
-
 /* Side IDs are uint32_t */
 typedef uint32_t side_id_t;
 #define SIDE_MAX__ (UINT32_MAX-1)
diff --git a/src/test_senc2d_utils.h b/src/test_senc2d_utils.h
@@ -25,7 +25,7 @@
 /*******************************************************************************
  * Geometry
  ******************************************************************************/
-static const double square_vertices[4/*#vertices*/*2/*#coords per vertex*/] = {
+static double square_vertices[4/*#vertices*/*2/*#coords per vertex*/] = {
   0.0, 0.0,
   1.0, 0.0,
   0.0, 1.0,
@@ -42,7 +42,7 @@ square_nvertices = sizeof(square_vertices) / (2 * sizeof(*square_vertices));
  *    |    |
  *    0----1
  */
-static const unsigned
+static unsigned
 square_indices[4/*#segments*/*2/*#indices per segment*/] = {
   0, 2,
   2, 3,