X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=divelist.c;h=b9388f860d40c7907dcc40dc12276ae2cfacea22;hb=1a66a74e8a35c1fd85060060ba61bb1b67d6eb44;hp=32dc92b9980dc7bf75573c0880a84e069927b871;hpb=2175226580a523a9a3abba3723991b003eee5a2a;p=ext%2Fsubsurface.git

diff --git a/divelist.c b/divelist.c
index 32dc92b..b9388f8 100644
--- a/divelist.c
+++ b/divelist.c
@@ -230,7 +230,7 @@ static void temperature_data_func(GtkTreeViewColumn *col,
  *  - Nitrox trumps air (even if hypoxic)
  * These are the same rules as the inter-dive sorting rules.
  */
-static void get_dive_gas(struct dive *dive, int *o2, int *he, int *o2low)
+static void get_dive_gas(struct dive *dive, int *o2_p, int *he_p, int *o2low_p)
 {
 	int i;
 	int maxo2 = -1, maxhe = -1, mino2 = 1000;
@@ -244,7 +244,7 @@ static void get_dive_gas(struct dive *dive, int *o2, int *he, int *o2low)
 		if (cylinder_none(cyl))
 			continue;
 		if (!o2)
-			o2 = 209;
+			o2 = AIR_PERMILLE;
 		if (o2 < mino2)
 			mino2 = o2;
 		if (he > maxhe)
@@ -258,11 +258,11 @@ newmax:
 		maxo2 = o2;
 	}
 	/* All air? Show/sort as "air"/zero */
-	if (!maxhe && maxo2 == 209 && mino2 == maxo2)
+	if (!maxhe && maxo2 == AIR_PERMILLE && mino2 == maxo2)
 		maxo2 = mino2 = 0;
-	*o2 = maxo2;
-	*he = maxhe;
-	*o2low = mino2;
+	*o2_p = maxo2;
+	*he_p = maxhe;
+	*o2low_p = mino2;
 }
 
 static gint nitrox_sort_func(GtkTreeModel *model,
@@ -394,7 +394,7 @@ static int calculate_otu(struct dive *dive)
 		t = sample->time.seconds - psample->time.seconds;
 		int o2 = dive->cylinder[sample->cylinderindex].gasmix.o2.permille;
 		if (!o2)
-			o2 = 209;
+			o2 = AIR_PERMILLE;
 		po2 = o2 / 1000.0 * (sample->depth.mm + 10000) / 10000.0;
 		if (po2 >= 0.5)
 			otu += pow(po2 - 0.5, 0.83) * t / 30.0;
@@ -625,7 +625,7 @@ static struct divelist_column {
 	sort_func_t sort;
 	unsigned int flags;
 	int *visible;
-} column[] = {
+} dl_column[] = {
 	[DIVE_NR] = { "#", NULL, NULL, ALIGN_RIGHT | UNSORTABLE },
 	[DIVE_DATE] = { "Date", date_data_func, NULL, ALIGN_LEFT },
 	[DIVE_RATING] = { UTF8_BLACKSTAR, star_data_func, NULL, ALIGN_LEFT },
@@ -642,7 +642,7 @@ static struct divelist_column {
 
 static GtkTreeViewColumn *divelist_column(struct DiveList *dl, struct divelist_column *col)
 {
-	int index = col - &column[0];
+	int index = col - &dl_column[0];
 	const char *title = col->header;
 	data_func_t data_func = col->data;
 	sort_func_t sort_func = col->sort;
@@ -709,17 +709,17 @@ GtkWidget *dive_list_create(void)
 	gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_MULTIPLE);
 	gtk_widget_set_size_request(dive_list.tree_view, 200, 200);
 
-	dive_list.nr = divelist_column(&dive_list, column + DIVE_NR);
-	dive_list.date = divelist_column(&dive_list, column + DIVE_DATE);
-	dive_list.stars = divelist_column(&dive_list, column + DIVE_RATING);
-	dive_list.depth = divelist_column(&dive_list, column + DIVE_DEPTH);
-	dive_list.duration = divelist_column(&dive_list, column + DIVE_DURATION);
-	dive_list.temperature = divelist_column(&dive_list, column + DIVE_TEMPERATURE);
-	dive_list.cylinder = divelist_column(&dive_list, column + DIVE_CYLINDER);
-	dive_list.nitrox = divelist_column(&dive_list, column + DIVE_NITROX);
-	dive_list.sac = divelist_column(&dive_list, column + DIVE_SAC);
-	dive_list.otu = divelist_column(&dive_list, column + DIVE_OTU);
-	dive_list.location = divelist_column(&dive_list, column + DIVE_LOCATION);
+	dive_list.nr = divelist_column(&dive_list, dl_column + DIVE_NR);
+	dive_list.date = divelist_column(&dive_list, dl_column + DIVE_DATE);
+	dive_list.stars = divelist_column(&dive_list, dl_column + DIVE_RATING);
+	dive_list.depth = divelist_column(&dive_list, dl_column + DIVE_DEPTH);
+	dive_list.duration = divelist_column(&dive_list, dl_column + DIVE_DURATION);
+	dive_list.temperature = divelist_column(&dive_list, dl_column + DIVE_TEMPERATURE);
+	dive_list.cylinder = divelist_column(&dive_list, dl_column + DIVE_CYLINDER);
+	dive_list.nitrox = divelist_column(&dive_list, dl_column + DIVE_NITROX);
+	dive_list.sac = divelist_column(&dive_list, dl_column + DIVE_SAC);
+	dive_list.otu = divelist_column(&dive_list, dl_column + DIVE_OTU);
+	dive_list.location = divelist_column(&dive_list, dl_column + DIVE_LOCATION);
 
 	fill_dive_list();