diff options
Diffstat (limited to 'libdimension')
| -rw-r--r-- | libdimension/error.c | 22 | ||||
| -rw-r--r-- | libdimension/sphere.c | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/libdimension/error.c b/libdimension/error.c index 38ba40b..a8c7ec7 100644 --- a/libdimension/error.c +++ b/libdimension/error.c @@ -26,17 +26,17 @@ static dmnsn_severity dmnsn_resilience = DMNSN_SEVERITY_MEDIUM; static pthread_mutex_t dmnsn_resilience_mutex = PTHREAD_MUTEX_INITIALIZER; -// Called by dmnsn_error macro (don't call directly). +/* Called by dmnsn_error macro (don't call directly). */ void dmnsn_report_error(dmnsn_severity severity, const char *func, unsigned int line, const char *str) { if (severity >= dmnsn_get_resilience()) { - // An error more severe than our resilience happened, bail out + /* An error more severe than our resilience happened, bail out */ fprintf(stderr, "Dimension ERROR: %s, line %u: %s\n", func, line, str); exit(EXIT_FAILURE); } else { - // A trivial error happened, warn and continue + /* A trivial error happened, warn and continue */ fprintf(stderr, "Dimension WARNING: %s, line %u: %s\n", func, line, str); } } @@ -47,15 +47,15 @@ dmnsn_get_resilience() { dmnsn_severity resilience; if (pthread_mutex_lock(&dmnsn_resilience_mutex) != 0) { - // Couldn't lock the mutex, so warn and continue. + /* Couldn't lock the mutex, so warn and continue. */ fprintf(stderr, "Dimension WARNING: %s, line %u: %s\n", __PRETTY_FUNCTION__, __LINE__, "Couldn't lock resilience mutex."); } - resilience = dmnsn_resilience; // Copy the static variable to a local + resilience = dmnsn_resilience; /* Copy the static variable to a local */ if (pthread_mutex_unlock(&dmnsn_resilience_mutex) != 0) { - // Couldn't unlock the mutex, so warn and continue. If the mutex was locked - // earlier, the next dmnsn_get/set_resilience is likely to hang. + /* Couldn't unlock the mutex, so warn and continue. If the mutex was locked + earlier, the next dmnsn_get/set_resilience is likely to hang. */ fprintf(stderr, "Dimension WARNING: %s, line %u: %s\n", __PRETTY_FUNCTION__, __LINE__, "Couldn't unlock resilience mutex."); @@ -67,7 +67,7 @@ void dmnsn_set_resilience(dmnsn_severity resilience) { if (resilience > DMNSN_SEVERITY_HIGH) { - // Tried to set an illegal resilience, bail out + /* Tried to set an illegal resilience, bail out */ fprintf(stderr, "Dimension ERROR: %s, line %u: %s\n", __PRETTY_FUNCTION__, __LINE__, "Resilience has wrong value."); @@ -75,15 +75,15 @@ dmnsn_set_resilience(dmnsn_severity resilience) } if (pthread_mutex_lock(&dmnsn_resilience_mutex) != 0) { - // Couldn't lock the mutex, so warn and continue. + /* Couldn't lock the mutex, so warn and continue. */ fprintf(stderr, "Dimension WARNING: %s, line %u: %s\n", __PRETTY_FUNCTION__, __LINE__, "Couldn't lock resilience mutex."); } dmnsn_resilience = resilience; if (pthread_mutex_unlock(&dmnsn_resilience_mutex) != 0) { - // Couldn't unlock the mutex, so warn and continue. If the mutex was locked - // earlier, the next dmnsn_get/set_resilience is likely to hang. + /* Couldn't unlock the mutex, so warn and continue. If the mutex was locked + earlier, the next dmnsn_get/set_resilience is likely to hang. */ fprintf(stderr, "Dimension WARNING: %s, line %u: %s\n", __PRETTY_FUNCTION__, __LINE__, "Couldn't unlock resilience mutex."); diff --git a/libdimension/sphere.c b/libdimension/sphere.c index 2829720..5a4d1a9 100644 --- a/libdimension/sphere.c +++ b/libdimension/sphere.c @@ -50,7 +50,7 @@ dmnsn_sphere_intersections_fn(const dmnsn_object *sphere, dmnsn_line line) double a, b, c, t[2]; dmnsn_array *array = dmnsn_new_array(sizeof(double)); - // Solve (x0 + nx*t)^2 + (y0 + ny*t)^2 + (z0 + nz*t)^2 == 1 + /* Solve (x0 + nx*t)^2 + (y0 + ny*t)^2 + (z0 + nz*t)^2 == 1 */ a = line.n.x*line.n.x + line.n.y*line.n.y + line.n.z*line.n.z; b = 2.0*(line.n.x*line.x0.x + line.n.y*line.x0.y + line.n.z*line.x0.z); |