solstice-solver

commit fdd8d995b0bb9be7b0c053fb1ca77f21c06ac3f0
parent 712c354088ba615afaf46966d30ce16f14dc7e10
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Tue,  6 Sep 2016 18:41:28 +0200

Cleanup enums checks.

Diffstat:
M
src/ssol_material.c
 | 
9
+++------
M
src/ssol_material_c.h
 | 
4
+---
M
src/ssol_sun.c
 | 
2
+-
M
src/ssol_sun_c.h
 | 
3
++-

4 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/ssol_material.c b/src/ssol_material.c
@@ -104,8 +104,7 @@ ssol_material_create
   res_T res = RES_OK;
   if(!dev
   || !out_material
-  || type < MATERIAL_FIRST_TYPE
-  || type > MATERIAL_LAST_TYPE) {
+  || type >= MATERIAL_TYPES_COUNT__) {
     return RES_BAD_ARG;
   }
 
@@ -140,8 +139,7 @@ ssol_material_ref_get(struct ssol_material* material)
 {
   if (!material)
     return RES_BAD_ARG;
-  ASSERT(material->type >= MATERIAL_FIRST_TYPE);
-  ASSERT(material->type <= MATERIAL_LAST_TYPE);
+  ASSERT(material->type < MATERIAL_TYPES_COUNT__);
   ref_get(&material->ref);
   return RES_OK;
 }
@@ -151,8 +149,7 @@ ssol_material_ref_put(struct ssol_material* material)
 {
   if (!material)
     return RES_BAD_ARG;
-  ASSERT(material->type >= MATERIAL_FIRST_TYPE);
-  ASSERT(material->type <= MATERIAL_LAST_TYPE);
+  ASSERT(material->type < MATERIAL_TYPES_COUNT__);
   ref_put(&material->ref, material_release);
   return RES_OK;
 }
diff --git a/src/ssol_material_c.h b/src/ssol_material_c.h
@@ -37,9 +37,7 @@ static const struct surface_fragment SURFACE_FRAGMENT_NULL =
 enum material_type {
   MATERIAL_VIRTUAL,
   MATERIAL_MIRROR,
-
-  MATERIAL_FIRST_TYPE = MATERIAL_VIRTUAL,
-  MATERIAL_LAST_TYPE = MATERIAL_MIRROR
+  MATERIAL_TYPES_COUNT__
 };
 
 struct ssol_material {
diff --git a/src/ssol_sun.c b/src/ssol_sun.c
@@ -47,7 +47,7 @@ sun_create
 {
   struct ssol_sun* sun = NULL;
   res_T res = RES_OK;
-  if (!dev || !out_sun) {
+  if (!dev || !out_sun || type >= SUN_TYPES_COUNT__) {
     return RES_BAD_ARG;
   }
 
diff --git a/src/ssol_sun_c.h b/src/ssol_sun_c.h
@@ -22,7 +22,8 @@
 enum sun_type {
   SUN_DIRECTIONAL,
   SUN_PILLBOX,
-  SUN_BUIE
+  SUN_BUIE,
+  SUN_TYPES_COUNT__
 };
 
 struct pillbox {