summaryrefslogtreecommitdiffstats
path: root/device.c
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2014-02-27 20:09:57 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-02-27 20:09:57 -0800
commit76e6420f6b3503b76bd3eec00ab0e53d6ea17a20 (patch)
tree8b50298f41bd29d55bbd6f4301f36ad31dc0b008 /device.c
parent006265d7a088cff4fea665159dbb454956c2cd76 (diff)
downloadsubsurface-76e6420f6b3503b76bd3eec00ab0e53d6ea17a20.tar.gz
Massive automated whitespace cleanup
I know everyone will hate it. Go ahead. Complain. Call me names. At least now things are consistent and reproducible. If you want changes, have your complaint come with a patch to scripts/whitespace.pl so that we can automate it. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'device.c')
-rw-r--r--device.c30
1 files changed, 18 insertions, 12 deletions
diff --git a/device.c b/device.c
index 824a002e5..c952c84be 100644
--- a/device.c
+++ b/device.c
@@ -63,19 +63,23 @@
*/
static int fill_samples(struct sample *s, int max_d, int avg_d, int max_t, double slope, double d_frac)
{
- double t_frac = max_t*(1-avg_d/(double)max_d);
+ double t_frac = max_t * (1 - avg_d / (double)max_d);
int t1 = max_d / slope;
- int t4 = max_t - t1*d_frac;
- int t3 = t4-(t_frac-t1)/(1-d_frac);
- int t2 = t3-t1*(1-d_frac);
+ int t4 = max_t - t1 * d_frac;
+ int t3 = t4 - (t_frac - t1) / (1 - d_frac);
+ int t2 = t3 - t1 * (1 - d_frac);
if (t1 < 0 || t1 > t2 || t2 > t3 || t3 > t4 || t4 > max_t)
return 0;
- s[1].time.seconds = t1; s[1].depth.mm = max_d;
- s[2].time.seconds = t2; s[2].depth.mm = max_d;
- s[3].time.seconds = t3; s[3].depth.mm = max_d * d_frac;
- s[4].time.seconds = t4; s[4].depth.mm = max_d * d_frac;
+ s[1].time.seconds = t1;
+ s[1].depth.mm = max_d;
+ s[2].time.seconds = t2;
+ s[2].depth.mm = max_d;
+ s[3].time.seconds = t3;
+ s[3].depth.mm = max_d * d_frac;
+ s[4].time.seconds = t4;
+ s[4].depth.mm = max_d * d_frac;
return 1;
}
@@ -88,8 +92,10 @@ static void fill_samples_no_avg(struct sample *s, int max_d, int max_t, double s
{
// shallow or short dives are just trapecoids based on the given slope
if (max_d < 10000 || max_t < 600) {
- s[1].time.seconds = max_d / slope; s[1].depth.mm = max_d;
- s[2].time.seconds = max_t - max_d / slope; s[2].depth.mm = max_d;
+ s[1].time.seconds = max_d / slope;
+ s[1].depth.mm = max_d;
+ s[2].time.seconds = max_t - max_d / slope;
+ s[2].depth.mm = max_d;
} else {
s[1].time.seconds = max_d / slope;
s[1].depth.mm = max_d;
@@ -102,7 +108,7 @@ static void fill_samples_no_avg(struct sample *s, int max_d, int max_t, double s
}
}
-struct divecomputer* fake_dc(struct divecomputer* dc)
+struct divecomputer *fake_dc(struct divecomputer *dc)
{
static struct sample fake[6];
static struct divecomputer fakedc;
@@ -139,7 +145,7 @@ struct divecomputer* fake_dc(struct divecomputer* dc)
return &fakedc;
}
if (avg_d < max_d / 10 || avg_d >= max_d) {
- avg_d = (max_d+10000)/3;
+ avg_d = (max_d + 10000) / 3;
if (avg_d > max_d)
avg_d = max_d * 2 / 3;
}