Refactor scan_gas

1 files changed, 20 insertions, 15 deletions

diff --git a/src/output.c b/src/output.c
index 1d51a08..43ee82a 100644
--- a/src/output.c
+++ b/src/output.c
@@ -35,29 +35,34 @@ void format_gas(char *buf, size_t buflen, const gas_t *gas)
 
 int scan_gas(gas_t *gas, char *str)
 {
-    int o2 = -1;
-    int he = -1;
+    int o2 = 0;
+    int he = 0;
 
     if (!strcmp(str, "Air")) {
-        *gas = gas_new(21, 0, MOD_AUTO);
-        return 0;
+        o2 = 21;
+        goto match;
     }
 
     if (!strcmp(str, "Oxygen")) {
-        *gas = gas_new(100, 0, MOD_AUTO);
-        return 0;
+        o2 = 100;
+        goto match;
     }
 
-    if (!strncmp(str, "EAN", strlen("EAN"))) {
-        sscanf(str, "EAN%i", &o2);
-        he = 0;
-    } else if (!strncmp(str, "Nitrox", strlen("Nitrox"))) {
-        sscanf(str, "Nitrox %i", &o2);
-        he = 0;
-    } else {
-        sscanf(str, "%i/%i", &o2, &he);
-    }
+    if (sscanf(str, "%i/%i", &o2, &he) == 2)
+        goto match;
+
+    if (sscanf(str, "EAN %i", &o2) == 1)
+        goto match;
+
+    if (sscanf(str, "Nitrox %i", &o2) == 1)
+        goto match;
+
+    if (sscanf(str, "%i", &o2) == 1)
+        goto match;
+
+    return -EINVAL;
 
+match:
     if (o2 < 0 || he < 0)
         return -EINVAL;