mirror/astronomy
1
0
Fork 0
mirror of https://github.com/cosinekitty/astronomy.git synced 2026-05-19 06:17:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor tweaks for cppcheck. Use const pointers for grav sim.

Browse Source 
Slightly different cppcheck dev 2.11 behaviors have added
another warning that I don't care about. I don't want to
have to convert callback pointers to const, then cast them
to const.

However, it did find a couple of useful cases I fixed in
astronomy.c where GravSim parameters could be made const.
This commit is contained in:
Don Cross
2023-06-19 12:37:39 -04:00
parent bb27adfdfa
commit 7cf1a7eb7d
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
generate/template/astronomy.c
View File

@@ -3265,7 +3265,7 @@ astro_status_t Astronomy_GravSimUpdate(
current accelerations apply across the whole time interval.
approx_pos = pos1 + vel1*dt + (1/2)acc*dt^2
*/
body_grav_calc_t *prev = &sim->prev->bodies[i];
const body_grav_calc_t *prev = &sim->prev->bodies[i];
sim->curr->bodies[i].r = UpdatePosition(dt, prev->r, prev->v, prev->a);
}
@@ -3277,7 +3277,7 @@ astro_status_t Astronomy_GravSimUpdate(
for (i = 0; i < numBodies; ++i)
{
body_grav_calc_t *prev = &sim->prev->bodies[i];
const body_grav_calc_t *prev = &sim->prev->bodies[i];
body_grav_calc_t *curr = &sim->curr->bodies[i];
/*
@@ -3442,7 +3442,7 @@ void Astronomy_GravSimSwap(astro_grav_sim_t *sim)
* @param sim
* A gravity simulator object that was created by a prior call to #Astronomy_GravSimInit.
*/
astro_time_t Astronomy_GravSimTime(astro_grav_sim_t *sim)
astro_time_t Astronomy_GravSimTime(const astro_grav_sim_t *sim)
{
return sim->curr->time;
}
@@ -3459,7 +3459,7 @@ astro_time_t Astronomy_GravSimTime(astro_grav_sim_t *sim)
* @param sim
* A gravity simulator object that was created by a prior call to #Astronomy_GravSimInit.
*/
int Astronomy_GravSimNumBodies(astro_grav_sim_t *sim)
int Astronomy_GravSimNumBodies(const astro_grav_sim_t *sim)
{
return sim->numBodies;
}
@@ -3476,7 +3476,7 @@ int Astronomy_GravSimNumBodies(astro_grav_sim_t *sim)
* @param sim
* A gravity simulator object that was created by a prior call to #Astronomy_GravSimInit.
*/
astro_body_t Astronomy_GravSimOrigin(astro_grav_sim_t *sim)
astro_body_t Astronomy_GravSimOrigin(const astro_grav_sim_t *sim)
{
return sim->originBody;
}

2
generate/unit_test_c
View File

@@ -8,7 +8,7 @@ Fail()
[[ "$1" == "" || "$1" == "-v" ]] || Fail "Invalid command line options."
[[ -z "${CPP}" ]] && CPP=g++
cppcheck -I ../source/c --enable=all --inline-suppr --suppress=variableScope --suppress=shadowFunction --suppress=unusedFunction --suppress=missingIncludeSystem --error-exitcode=9 ../source/c ../demo/c/*.c ctest.c || exit 1
cppcheck -I ../source/c --enable=all --inline-suppr --suppress=unmatchedSuppression --suppress=variableScope --suppress=shadowFunction --suppress=unusedFunction --suppress=missingIncludeSystem --suppress=constParameterCallback --error-exitcode=9 ../source/c ../demo/c/*.c ctest.c || exit 1
# Verify that the source can be built as modern C++.
${CPP} -x c++ -std=c++17 -c -Wall -Werror -O3 ../source/c/astronomy.c || Fail "Cannot compile as C++"

6
source/c/README.md
View File

@@ -985,7 +985,7 @@ When a simulation is created by a call to [`Astronomy_GravSimInit`](#Astronomy_G
| Type | Parameter | Description |
| --- | --- | --- |
| <code><a href="#astro_grav_sim_t">astro_grav_sim_t</a> *</code> | `sim` | A gravity simulator object that was created by a prior call to [`Astronomy_GravSimInit`](#Astronomy_GravSimInit). |
| `const astro_grav_sim_t *` | `sim` | A gravity simulator object that was created by a prior call to [`Astronomy_GravSimInit`](#Astronomy_GravSimInit). |
@@ -1005,7 +1005,7 @@ When a simulation is created by a call to [`Astronomy_GravSimInit`](#Astronomy_G
| Type | Parameter | Description |
| --- | --- | --- |
| <code><a href="#astro_grav_sim_t">astro_grav_sim_t</a> *</code> | `sim` | A gravity simulator object that was created by a prior call to [`Astronomy_GravSimInit`](#Astronomy_GravSimInit). |
| `const astro_grav_sim_t *` | `sim` | A gravity simulator object that was created by a prior call to [`Astronomy_GravSimInit`](#Astronomy_GravSimInit). |
@@ -1049,7 +1049,7 @@ Usually this function will be called immediately after a matching call to [`Astr
| Type | Parameter | Description |
| --- | --- | --- |
| <code><a href="#astro_grav_sim_t">astro_grav_sim_t</a> *</code> | `sim` | A gravity simulator object that was created by a prior call to [`Astronomy_GravSimInit`](#Astronomy_GravSimInit). |
| `const astro_grav_sim_t *` | `sim` | A gravity simulator object that was created by a prior call to [`Astronomy_GravSimInit`](#Astronomy_GravSimInit). |

10
source/c/astronomy.c
View File

@@ -4199,7 +4199,7 @@ astro_status_t Astronomy_GravSimUpdate(
current accelerations apply across the whole time interval.
approx_pos = pos1 + vel1*dt + (1/2)acc*dt^2
*/
body_grav_calc_t *prev = &sim->prev->bodies[i];
const body_grav_calc_t *prev = &sim->prev->bodies[i];
sim->curr->bodies[i].r = UpdatePosition(dt, prev->r, prev->v, prev->a);
}
@@ -4211,7 +4211,7 @@ astro_status_t Astronomy_GravSimUpdate(
for (i = 0; i < numBodies; ++i)
{
body_grav_calc_t *prev = &sim->prev->bodies[i];
const body_grav_calc_t *prev = &sim->prev->bodies[i];
body_grav_calc_t *curr = &sim->curr->bodies[i];
/*
@@ -4376,7 +4376,7 @@ void Astronomy_GravSimSwap(astro_grav_sim_t *sim)
* @param sim
* A gravity simulator object that was created by a prior call to #Astronomy_GravSimInit.
*/
astro_time_t Astronomy_GravSimTime(astro_grav_sim_t *sim)
astro_time_t Astronomy_GravSimTime(const astro_grav_sim_t *sim)
{
return sim->curr->time;
}
@@ -4393,7 +4393,7 @@ astro_time_t Astronomy_GravSimTime(astro_grav_sim_t *sim)
* @param sim
* A gravity simulator object that was created by a prior call to #Astronomy_GravSimInit.
*/
int Astronomy_GravSimNumBodies(astro_grav_sim_t *sim)
int Astronomy_GravSimNumBodies(const astro_grav_sim_t *sim)
{
return sim->numBodies;
}
@@ -4410,7 +4410,7 @@ int Astronomy_GravSimNumBodies(astro_grav_sim_t *sim)
* @param sim
* A gravity simulator object that was created by a prior call to #Astronomy_GravSimInit.
*/
astro_body_t Astronomy_GravSimOrigin(astro_grav_sim_t *sim)
astro_body_t Astronomy_GravSimOrigin(const astro_grav_sim_t *sim)
{
return sim->originBody;
}

6
source/c/astronomy.h
View File

@@ -1384,9 +1384,9 @@ astro_state_vector_t Astronomy_GravSimBodyState(
astro_body_t body
);
astro_time_t Astronomy_GravSimTime(astro_grav_sim_t *sim);
int Astronomy_GravSimNumBodies(astro_grav_sim_t *sim);
astro_body_t Astronomy_GravSimOrigin(astro_grav_sim_t *sim);
astro_time_t Astronomy_GravSimTime(const astro_grav_sim_t *sim);
int Astronomy_GravSimNumBodies(const astro_grav_sim_t *sim);
astro_body_t Astronomy_GravSimOrigin(const astro_grav_sim_t *sim);
void Astronomy_GravSimSwap(astro_grav_sim_t *sim);
void Astronomy_GravSimFree(astro_grav_sim_t *sim);