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

Cleanup: localize enum and table in divelist.c

Browse source 
The cns_table was only used in divelist.c. Make it of static
linkage accordingly.

The cns_table_headers enum is likewise only used in divelist.c.
Therefore move it from the header to the .c file.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-06-04 20:41:31 +02:00 committed by Dirk Hohndel
parent 821f68550d
commit f4ef1c4bc8
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/divelist.c
View file

@ -159,6 +159,7 @@ static int calculate_otu(const struct dive *dive)
} }
return lrint(otu); return lrint(otu);
} }
/* Table of maximum oxygen exposure durations, used in CNS calulations. /* Table of maximum oxygen exposure durations, used in CNS calulations.
This table shows the official NOAA maximum O2 exposure limits (in seconds) for different PO2 values. It also gives This table shows the official NOAA maximum O2 exposure limits (in seconds) for different PO2 values. It also gives
slope values for linear interpolation for intermediate PO2 values between the tabulated PO2 values in the 1st column. slope values for linear interpolation for intermediate PO2 values between the tabulated PO2 values in the 1st column.
@ -169,7 +170,8 @@ static int calculate_otu(const struct dive *dive)
preserve the integer structure of the table, all slopes are given as slope*10: divide by 10 to get the valid slope. preserve the integer structure of the table, all slopes are given as slope*10: divide by 10 to get the valid slope.
The columns below are: The columns below are:
po2 (mbar), Maximum Single Exposure (seconds), single_slope, Maximum 24 hour Exposure (seconds), 24h_slope */ po2 (mbar), Maximum Single Exposure (seconds), single_slope, Maximum 24 hour Exposure (seconds), 24h_slope */
int const cns_table[][5] = { enum cns_table_headers {PO2VAL, SINGLE_EXP, SINGLE_SLOPE, DAILY_EXP, DAILY_SLOPE, NO_COLUMNS};
static int const cns_table[][5] = {
{ 1600, 45 * 60, 456, 150 * 60, 180 }, { 1600, 45 * 60, 456, 150 * 60, 180 },
{ 1550, 83 * 60, 456, 165 * 60, 180 }, { 1550, 83 * 60, 456, 165 * 60, 180 },
{ 1500, 120 * 60, 444, 180 * 60, 180 }, { 1500, 120 * 60, 444, 180 * 60, 180 },

2
core/divelist.h
View file

@ -60,8 +60,6 @@ int get_dive_id_closest_to(timestamp_t when);
void clear_dive_file_data(); void clear_dive_file_data();
void clear_table(struct dive_table *table); void clear_table(struct dive_table *table);
typedef enum {PO2VAL, SINGLE_EXP, SINGLE_SLOPE, DAILY_EXP, DAILY_SLOPE, NO_COLUMNS} cns_table_headers;
#ifdef DEBUG_TRIP #ifdef DEBUG_TRIP
extern void dump_selection(void); extern void dump_selection(void);
#endif #endif