mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-11 03:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: Fix new Findings in Coverity Scan.

Browse source 
Fix some findings in a Coverity scan in `core/planner.cpp` and
`core/profile.cpp`, that were reported as new after the changes
in #4126 (likely because of the rename from .c to .cpp).
Results: https://scan4.scan.coverity.com/#/project-view/60459/13160

Signed-off-by: Michael Keller <mikeller@042.ch>
This commit is contained in:
Michael Keller 2024-04-24 12:24:40 +12:00 committed by Robert C. Helling
parent e7a6de3894
commit 9deef235e2
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/planner.cpp
View file

@ -858,7 +858,6 @@ bool plan(struct deco_state *ds, struct diveplan *diveplan, struct dive *dive, i
bailoutsegment, po2, divemode, prefs.bottomsac, true); bailoutsegment, po2, divemode, prefs.bottomsac, true);
plan_add_segment(diveplan, bailoutsegment, depth, current_cylinder, po2, false, divemode); plan_add_segment(diveplan, bailoutsegment, depth, current_cylinder, po2, false, divemode);
bottom_time += bailoutsegment; bottom_time += bailoutsegment;
last_segment_min_switch = true;
} }
previous_deco_time = 100000000; previous_deco_time = 100000000;
ds->deco_time = 10000000; ds->deco_time = 10000000;
@ -952,10 +951,10 @@ bool plan(struct deco_state *ds, struct diveplan *diveplan, struct dive *dive, i
stopping = true; stopping = true;
previous_point_time = clock; previous_point_time = clock;
current_cylinder = gaschanges[gi].gasidx; current_cylinder = gaschanges[gi].gasidx;
gas = get_cylinder(dive, current_cylinder)->gasmix;
if (divemode == CCR) if (divemode == CCR)
po2 = setpoint_change(dive, current_cylinder); po2 = setpoint_change(dive, current_cylinder);
#if DEBUG_PLAN & 16 #if DEBUG_PLAN & 16
gas = get_cylinder(dive, current_cylinder)->gasmix;
printf("switch to gas %d (%d/%d) @ %5.2lfm\n", gaschanges[gi].gasidx, printf("switch to gas %d (%d/%d) @ %5.2lfm\n", gaschanges[gi].gasidx,
(get_o2(&gas) + 5) / 10, (get_he(&gas) + 5) / 10, gaschanges[gi].depth / 1000.0); (get_o2(&gas) + 5) / 10, (get_he(&gas) + 5) / 10, gaschanges[gi].depth / 1000.0);
#endif #endif
@ -1008,10 +1007,10 @@ bool plan(struct deco_state *ds, struct diveplan *diveplan, struct dive *dive, i
*/ */
if (pendinggaschange) { if (pendinggaschange) {
current_cylinder = gaschanges[gi + 1].gasidx; current_cylinder = gaschanges[gi + 1].gasidx;
gas = get_cylinder(dive, current_cylinder)->gasmix;
if (divemode == CCR) if (divemode == CCR)
po2 = setpoint_change(dive, current_cylinder); po2 = setpoint_change(dive, current_cylinder);
#if DEBUG_PLAN & 16 #if DEBUG_PLAN & 16
gas = get_cylinder(dive, current_cylinder)->gasmix;
printf("switch to gas %d (%d/%d) @ %5.2lfm\n", gaschanges[gi + 1].gasidx, printf("switch to gas %d (%d/%d) @ %5.2lfm\n", gaschanges[gi + 1].gasidx,
(get_o2(&gas) + 5) / 10, (get_he(&gas) + 5) / 10, gaschanges[gi + 1].depth / 1000.0); (get_o2(&gas) + 5) / 10, (get_he(&gas) + 5) / 10, gaschanges[gi + 1].depth / 1000.0);
#endif #endif
@ -1021,7 +1020,6 @@ bool plan(struct deco_state *ds, struct diveplan *diveplan, struct dive *dive, i
get_cylinder(dive, current_cylinder)->gasmix, get_cylinder(dive, current_cylinder)->gasmix,
prefs.min_switch_duration, po2, divemode, prefs.decosac, true); prefs.min_switch_duration, po2, divemode, prefs.decosac, true);
clock += prefs.min_switch_duration; clock += prefs.min_switch_duration;
last_segment_min_switch = true;
} }
pendinggaschange = false; pendinggaschange = false;
} }
@ -1058,7 +1056,6 @@ bool plan(struct deco_state *ds, struct diveplan *diveplan, struct dive *dive, i
plan_add_segment(diveplan, laststoptime, depth, current_cylinder, po2, false, divemode); plan_add_segment(diveplan, laststoptime, depth, current_cylinder, po2, false, divemode);
previous_point_time = clock + laststoptime; previous_point_time = clock + laststoptime;
current_cylinder = break_cylinder; current_cylinder = break_cylinder;
gas = get_cylinder(dive, current_cylinder)->gasmix;
} }
} else if (o2break_next) { } else if (o2break_next) {
if (laststoptime >= 6 * 60) { if (laststoptime >= 6 * 60) {
@ -1070,7 +1067,6 @@ bool plan(struct deco_state *ds, struct diveplan *diveplan, struct dive *dive, i
plan_add_segment(diveplan, laststoptime, depth, current_cylinder, po2, false, divemode); plan_add_segment(diveplan, laststoptime, depth, current_cylinder, po2, false, divemode);
previous_point_time = clock + laststoptime; previous_point_time = clock + laststoptime;
current_cylinder = breakfrom_cylinder; current_cylinder = breakfrom_cylinder;
gas = get_cylinder(dive, current_cylinder)->gasmix;
} }
} }
} }

4
core/profile.cpp
View file

@ -749,7 +749,7 @@ static void add_plot_pressure(struct plot_info *pi, int time, int cyl, pressure_
static void setup_gas_sensor_pressure(const struct dive *dive, const struct divecomputer *dc, struct plot_info *pi) static void setup_gas_sensor_pressure(const struct dive *dive, const struct divecomputer *dc, struct plot_info *pi)
{ {
int prev, i; int i;
const struct event *ev; const struct event *ev;
if (pi->nr_cylinders == 0) if (pi->nr_cylinders == 0)
@ -762,7 +762,7 @@ static void setup_gas_sensor_pressure(const struct dive *dive, const struct dive
std::vector<int> last(num_cyl, INT_MAX); std::vector<int> last(num_cyl, INT_MAX);
const struct divecomputer *secondary; const struct divecomputer *secondary;
prev = explicit_first_cylinder(dive, dc); unsigned prev = (unsigned)explicit_first_cylinder(dive, dc);
seen[prev] = 1; seen[prev] = 1;
for (ev = get_next_event(dc->events, "gaschange"); ev != NULL; ev = get_next_event(ev->next, "gaschange")) { for (ev = get_next_event(dc->events, "gaschange"); ev != NULL; ev = get_next_event(ev->next, "gaschange")) {