solstice-solver

commit 5ccfdcb24c9e30b638685608e652fde3477eb5a4
parent 3e546e9fa0383dd435900f95762f4badd6784b9c
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Tue, 28 Jun 2016 17:43:55 +0200

Remove an unused shape type.

Was not used.

Diffstat:
M
src/ssol_shape.c
 | 
11
++++++-----
M
src/ssol_shape_c.h
 | 
1
-

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/ssol_shape.c b/src/ssol_shape.c
@@ -161,7 +161,10 @@ shape_create
   struct ssol_shape* shape = NULL;
   res_T res = RES_OK;
 
-  if (!dev || !out_shape) {
+  if (!dev
+      || !out_shape
+      || type < SHAPE_FIRST_TYPE
+      || type > SHAPE_LAST_TYPE) {
     return RES_BAD_ARG;
   }
 
@@ -218,8 +221,7 @@ ssol_shape_ref_get
 (struct ssol_shape* shape)
 {
   if (!shape) return RES_BAD_ARG;
-  ASSERT(shape->type == SHAPE_NONE
-    || (SHAPE_FIRST_TYPE <= shape->type && shape->type <= SHAPE_LAST_TYPE));
+  ASSERT(SHAPE_FIRST_TYPE <= shape->type && shape->type <= SHAPE_LAST_TYPE);
   ref_get(&shape->ref);
   return RES_OK;
 }
@@ -229,8 +231,7 @@ ssol_shape_ref_put
 (struct ssol_shape* shape)
 {
   if (!shape) return RES_BAD_ARG;
-  ASSERT(shape->type == SHAPE_NONE
-    || (SHAPE_FIRST_TYPE <= shape->type && shape->type <= SHAPE_LAST_TYPE));
+  ASSERT(SHAPE_FIRST_TYPE <= shape->type && shape->type <= SHAPE_LAST_TYPE);
   ref_put(&shape->ref, shape_release);
   return RES_OK;
 }
diff --git a/src/ssol_shape_c.h b/src/ssol_shape_c.h
@@ -19,7 +19,6 @@
 #include <rsys/ref_count.h>
 
 enum shape_type {
-  SHAPE_NONE,
   SHAPE_MESH,
   SHAPE_PUNCHED,