commit 5fa2ce4b7832738a1f8a61f047a9062e7fd53f27
parent f560ab7c0e50ffe965fd06c755c25332fcf98c8c
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date: Wed, 20 Nov 2019 10:30:29 +0100
Add a missing case in a switch; make some error message more informative.
Diffstat:
4 files changed, 47 insertions(+), 9 deletions(-)
diff --git a/src/stardis-app.c b/src/stardis-app.c
@@ -209,7 +209,11 @@ read_triangles
sa_push(boundary->sides, current_side);
continue; /* Next triangle */
break;
- default: FATAL("Invalid type.\n");
+ default: {
+ char msg[1024];
+ sprintf(msg, "%s (%s: %d): Invalid type.\n", __FUNCTION__, __FILE__, __LINE__);
+ FATAL(msg);
+ }
}
if (*side_desc_ptr != UINT_MAX && *side_desc_ptr != desc_id) {
/* Already described with a different description! */
@@ -517,7 +521,13 @@ stardis_release(struct stardis* stardis)
free(desc->d.f_boundary.flux);
te_free(desc->d.f_boundary.te_flux);
break;
- default: FATAL("Invalid type.\n");
+ case DESC_SOLID_FLUID_CONNECT:
+ break;
+ default: {
+ char msg[1024];
+ sprintf(msg, "%s (%s: %d): Invalid type.\n", __FUNCTION__, __FILE__, __LINE__);
+ FATAL(msg);
+ }
}
}
sa_release(stardis->descriptions);
diff --git a/src/stardis-app.h b/src/stardis-app.h
@@ -643,7 +643,11 @@ print_description
case DESC_BOUND_F_FOR_SOLID:
print_f_boundary(stream, &desc->d.f_boundary, desc->type);
break;
- default: FATAL("Invalid type.\n");
+ default: {
+ char msg[1024];
+ sprintf(msg, "%s (%s: %d): Invalid type.\n", __FUNCTION__, __FILE__, __LINE__);
+ FATAL(msg);
+ }
}
}
@@ -666,7 +670,11 @@ eq_description(const struct description* a, const struct description* b)
return eq_f_boundary(&a->d.f_boundary, &b->d.f_boundary);
case DESC_SOLID_FLUID_CONNECT:
return eq_sf_connect(&a->d.sf_connect, &b->d.sf_connect);
- default: FATAL("Invalid type.\n");
+ default: {
+ char msg[1024];
+ sprintf(msg, "%s (%s: %d): Invalid type.\n", __FUNCTION__, __FILE__, __LINE__);
+ FATAL(msg);
+ }
}
}
@@ -688,7 +696,11 @@ hash_description(const struct description* key)
return hash_f_boundary(&key->d.f_boundary);
case DESC_SOLID_FLUID_CONNECT:
return hash_sf_connect(&key->d.sf_connect);
- default: FATAL("Invalid type.\n");
+ default: {
+ char msg[1024];
+ sprintf(msg, "%s (%s: %d): Invalid type.\n", __FUNCTION__, __FILE__, __LINE__);
+ FATAL(msg);
+ }
}
}
diff --git a/src/stardis-compute.c b/src/stardis-compute.c
@@ -319,7 +319,11 @@ create_holder
if (res != RES_OK) goto error;
break;
- default: FATAL("Invalid type.\n");
+ default: {
+ char msg[1024];
+ sprintf(msg, "%s (%s: %d): Invalid type.\n", __FUNCTION__, __FILE__, __LINE__);
+ FATAL(msg);
+ }
}
end:
diff --git a/src/stardis-intface.c b/src/stardis-intface.c
@@ -147,7 +147,11 @@ create_intface
front_med = media[id];
fluid_side_shader = &interface_shader.front;
break;
- default: FATAL("Invalid type.\n");
+ default: {
+ char msg[1024];
+ sprintf(msg, "%s (%s: %d): Invalid type.\n", __FUNCTION__, __FILE__, __LINE__);
+ FATAL(msg);
+ }
}
}
if (back_defined) {
@@ -163,7 +167,11 @@ create_intface
back_med = media[id];
fluid_side_shader = &interface_shader.back;
break;
- default: FATAL("Invalid type.\n");
+ default: {
+ char msg[1024];
+ sprintf(msg, "%s (%s: %d): Invalid type.\n", __FUNCTION__, __FILE__, __LINE__);
+ FATAL(msg);
+ }
}
}
if (connect_defined) {
@@ -311,7 +319,11 @@ create_intface
interface_props->alpha = connect->d.sf_connect.specular_fraction;
}
break;
- default: FATAL("Invalid type.\n");
+ default: {
+ char msg[1024];
+ sprintf(msg, "%s (%s: %d): Invalid type.\n", __FUNCTION__, __FILE__, __LINE__);
+ FATAL(msg);
+ }
}
}