mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Silence a few warnings

Browse source 
None of these are actual bugs. But none of the fixes are harmful, either.
And much as I hate adding the 'default' clauses, I'd rather not have the
build output cluttered by invalid warnings.

The exception is the fix in divelistview.cpp - while I don't think it is
possible for this function to be called with no dive selected,
initializing pd to NULL is cheap insurance in case that does happen for
some weird reason.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-12-20 09:37:56 -08:00
parent 4ab58d6b47
commit 0421a161b4
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dive.c
View file

@ -57,6 +57,7 @@ int get_pressure_units(unsigned int mb, const char **units)
unit = translate("gettextFromC","pascal");
break;
case BAR:
default:
pressure = (mb + 500) / 1000;
unit = translate("gettextFromC","bar");
break;
@ -97,6 +98,7 @@ double get_volume_units(unsigned int ml, int *frac, const char **units)
switch (units_p->volume) {
case LITER:
default:
vol = ml / 1000.0;
unit = translate("gettextFromC","l");
decimals = 1;
@ -130,6 +132,7 @@ double get_depth_units(unsigned int mm, int *frac, const char **units)
switch (units_p->length) {
case METERS:
default:
d = mm / 1000.0;
unit = translate("gettextFromC","m");
decimals = d < 20;
@ -156,6 +159,7 @@ double get_vertical_speed_units(unsigned int mms, int *frac, const char **units)
switch (units_p->length) {
case METERS:
default:
d = mms / 1000.0 * time_factor;
unit = translate("gettextFromC",(units_p->vertical_speed_time == MINUTES) ? "m/min" : "m/s");
break;

5
parse-xml.c
View file

@ -267,7 +267,7 @@ double ascii_strtod(char *str, char **ptr)
{
char *p = str, c, *ep;
double val = 0.0;
double decimal;
double decimal = 1.0;
int sign = 0, esign = 0;
int numbers = 0, dot = 0;
@ -290,7 +290,6 @@ double ascii_strtod(char *str, char **ptr)
if (dot)
goto done;
dot = 1;
decimal = 1.0;
continue;
}
if (c >= '0' && c <= '9') {
@ -399,7 +398,7 @@ static enum number_type integer_or_float(char *buffer, union int_or_float *res)
static void pressure(char *buffer, void *_press)
{
double mbar;
double mbar = 0.0;
pressure_t *pressure = _press;
union int_or_float val;

2
qt-ui/divelistview.cpp
View file

@ -581,7 +581,7 @@ void DiveListView::addToTripAbove()
{
int idx, delta = (currentOrder == Qt::AscendingOrder) ? -1 : +1;
dive_trip_t *trip = NULL;
struct dive *pd;
struct dive *pd = NULL;
struct dive *d = (struct dive *) contextMenuIndex.data(DiveTripModel::DIVE_ROLE).value<void*>();
if (!d) // shouldn't happen as we only are setting up this action if this is a dive
return;