From afffcdbc0d6402e3dfee421f86938b98e12fb550 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 12 Sep 2011 09:47:55 -0700 Subject: [PATCH] Avoid using type 'gasmix_t': use 'struct gasmix' instead libdivecomputer already uses 'gasmix_t' for its own gasmix thing. I don't like th eway we step on each others name spaces, but hey, might as well just use 'struct gasmix' and avoid the typedef. Signed-off-by: Linus Torvalds --- dive.c | 2 +- dive.h | 6 +++--- parse-xml.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dive.c b/dive.c index ba5200f..e899c6c 100644 --- a/dive.c +++ b/dive.c @@ -246,7 +246,7 @@ static void merge_cylinder_type(cylinder_type_t *res, cylinder_type_t *a, cylind *res = *b; } -static void merge_cylinder_mix(gasmix_t *res, gasmix_t *a, gasmix_t *b) +static void merge_cylinder_mix(struct gasmix *res, struct gasmix *a, struct gasmix *b) { if (a->o2.permille) b = a; diff --git a/dive.h b/dive.h index 9e5d2c4..d96e010 100644 --- a/dive.h +++ b/dive.h @@ -69,10 +69,10 @@ typedef struct { int grams; } weight_t; -typedef struct { +struct gasmix { fraction_t o2; fraction_t he; -} gasmix_t; +}; typedef struct { volume_t size; @@ -82,7 +82,7 @@ typedef struct { typedef struct { cylinder_type_t type; - gasmix_t gasmix; + struct gasmix gasmix; pressure_t start, end; } cylinder_t; diff --git a/parse-xml.c b/parse-xml.c index e14d9db..d17f7a8 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -998,7 +998,7 @@ static void dive_start(void) memset(&tm, 0, sizeof(tm)); } -static void sanitize_gasmix(gasmix_t *mix) +static void sanitize_gasmix(struct gasmix *mix) { unsigned int o2, he; -- 2.43.0