From 482d38ade13cc4a02f12507a8454e950b2c16c3f Mon Sep 17 00:00:00 2001 From: AirBreak69 <26233861+AirBreak69@users.noreply.github.com> Date: Thu, 14 Jun 2018 21:02:04 +0200 Subject: [PATCH] Tidy grab_fields() --- src/main/io/gps.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/io/gps.c b/src/main/io/gps.c index f1cd7abc55..fa35f7398b 100644 --- a/src/main/io/gps.c +++ b/src/main/io/gps.c @@ -649,21 +649,22 @@ static uint32_t grab_fields(char *src, uint8_t mult) } if (src[i] == '.') { i++; - if (mult == 0) + if (mult == 0) { break; - else + } + else { src[i + mult] = 0; + } } tmp *= 10; - if (src[i] >= '0' && src[i] <= '9') + if (src[i] >= '0' && src[i] <= '9') { tmp += src[i] - '0'; - if (i >= 15) + } + if (i >= 15) { return 0; // out of bounds + } } - if (isneg) - return -tmp; // handle negative altitudes - else - return tmp; + return isneg ? -tmp : tmp; // handle negative altitudes } typedef struct gpsDataNmea_s {