return decimals;
}
-static int convert_volume_pressure(int ml, int mbar, double *v, double *p)
+static void convert_volume_pressure(int ml, int mbar, double *v, double *p)
{
- int decimals = 1;
double volume, pressure;
volume = ml / 1000.0;
if (output_units.pressure == PSI) {
pressure = mbar_to_PSI(mbar);
- decimals = 0;
} else
pressure = mbar / 1000.0;
}
*v = volume;
*p = pressure;
- return decimals;
}
static int convert_weight(int grams, double *m)
o2 = cyl->gasmix.o2.permille / 10.0;
he = cyl->gasmix.he.permille / 10.0;
if (!o2)
- o2 = 21.0;
+ o2 = AIR_PERMILLE / 10.0;
gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder->o2), o2);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder->he), he);
}
return !ws->weight.grams && !ws->description;
}
-static void set_one_cylinder(int index, void *_data, GtkListStore *model, GtkTreeIter *iter)
+static void set_one_cylinder(void *_data, GtkListStore *model, GtkTreeIter *iter)
{
cylinder_t *cyl = _data;
unsigned int start, end;
-1);
}
-static void set_one_weightsystem(int index, void *_data, GtkListStore *model, GtkTreeIter *iter)
+static void set_one_weightsystem(void *_data, GtkListStore *model, GtkTreeIter *iter)
{
weightsystem_t *ws = _data;
struct equipment_list *equipment_list,
void*(*ptr_function)(struct dive*, int),
int(*none_function)(void *),
- void(*set_one_function)(int, void*, GtkListStore*, GtkTreeIter *))
+ void(*set_one_function)(void*, GtkListStore*, GtkTreeIter *))
{
int i, used;
void *data;
for (i = 0; i < used; i++) {
data = ptr_function(dive, i);
gtk_list_store_append(model, &iter);
- set_one_function(i, data, model, &iter);
+ set_one_function(data, model, &iter);
}
}
if (!edit_cylinder_dialog(index, &cyl))
return;
- set_one_cylinder(index, &cyl, model, &iter);
+ set_one_cylinder(&cyl, model, &iter);
repaint_dive();
}
return;
gtk_list_store_append(model, &iter);
- set_one_cylinder(index, &cyl, model, &iter);
+ set_one_cylinder(&cyl, model, &iter);
selection = gtk_tree_view_get_selection(tree_view);
gtk_tree_selection_select_iter(selection, &iter);
if (!edit_weightsystem_dialog(index, &ws))
return;
- set_one_weightsystem(index, &ws, model, &iter);
+ set_one_weightsystem(&ws, model, &iter);
repaint_dive();
}
return;
gtk_list_store_append(model, &iter);
- set_one_weightsystem(index, &ws, model, &iter);
+ set_one_weightsystem(&ws, model, &iter);
selection = gtk_tree_view_get_selection(tree_view);
gtk_tree_selection_select_iter(selection, &iter);