Fwd: [CCR PATCH] Allow for diluent cylinder pressure calculation [3 and 4]

[Dirk Hohndel]

Hi Willem

I applied the first of the two patches and did some massive whitespace
cleanup :-)

With that, this second patch makes no sense. Especially if you look at the
commit message. It mentions whitespace cleanups (OK, I did that already),
and then it mentions more code changes. And those clearly aren't in the
patch (I included it below in its entirety).

So I think we are still missing the actual final patch #4 :-)

I will push all this out within the hour, I'm still doing some cleanup
here.

/D

On Thu, Sep 11, 2014 at 01:09:31PM +0200, Willem Ferguson wrote:
> From 3e9260c09bb5e09946b5edaf2a2c68960fbd5e13 Mon Sep 17 00:00:00 2001
> From: willem ferguson <willemferguson at zoology.up.ac.za>
> Date: Fri, 5 Sep 2014 18:30:56 +0200
> Subject: [PATCH 2/2] Subject: [PATCH] CCR patch: adapt code for diluent
>  cylinder pressures (3)
> 
> Perform whitespace cleanup on the previous patch with the same heading.
> This is patch four of a series of four dealing with the calculation of
> diluent gas pressures in CCR dive logs.
> 
> These calculations are now finalised and activated.
> 
> Following patches will deal with oxygen partial pressure calculation.
> 
> Signed-off-by: willem ferguson <willemferguson at zoology.up.ac.za>
> ---
>  gaspressures.c | 2 +-
>  parse-xml.c    | 2 +-
>  profile.c      | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/gaspressures.c b/gaspressures.c
> index dfd6b6a..c653f08 100644
> --- a/gaspressures.c
> +++ b/gaspressures.c
> @@ -376,7 +376,7 @@ void populate_pressure_information(struct dive *dive, struct divecomputer *dc, s
>  		}
>  
>  		if (!pressure) {
> -			missing_pr = 1;  
> +			missing_pr = 1;
>  			continue;
>  		}
>  		current->end = pressure;
> diff --git a/parse-xml.c b/parse-xml.c
> index b1b40fc..02cf9f7 100644
> --- a/parse-xml.c
> +++ b/parse-xml.c
> @@ -836,7 +836,7 @@ static void try_to_fill_sample(struct sample *sample, const char *name, char *bu
>  	if (MATCH("cylpress.sample", pressure, &sample->cylinderpressure))
>  		return;
>  	if (MATCH("pdiluent.sample", pressure, &sample->diluentpressure))
> -		return;	
> +		return;
>  	if (MATCH("cylinderindex.sample", get_cylinderindex, &sample->sensor))
>  		return;
>  	if (MATCH("sensor.sample", get_sensor, &sample->sensor))
> diff --git a/profile.c b/profile.c
> index 0d8b5b6..32b914b 100644
> --- a/profile.c
> +++ b/profile.c
> @@ -867,7 +867,7 @@ static void calculate_gas_information_new(struct dive *dive, struct plot_info *p
>  static void debug_print_profiledata(struct plot_info *pi)
>  {
>  	FILE *f1;
> -        struct plot_data *entry;
> +	struct plot_data *entry;
>  	int i;
>  	if(!(f1 = fopen("debug_print_profiledata.dat","w"))) printf("File open error for: debug_print_profiledata.dat\n");
>  	else {
> -- 
> 1.9.1
>