param: use early return in lp_canonicalize_parameter_with_value()
authorMichael Adam <obnox@samba.org>
Wed, 23 Nov 2016 10:12:42 +0000 (11:12 +0100)
committerRalph Boehme <slow@samba.org>
Wed, 23 Nov 2016 12:00:21 +0000 (13:00 +0100)
This reduces the indentation and streamlines the flow.
View with "git show -w" to see it's mostly indentation change.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/param/loadparm.c

index b5b9190e19ff610c7a388288f3f031aab76c8f32..6ac7b693ce29274741d77888d5af64387ee264b0 100644 (file)
@@ -1713,16 +1713,17 @@ bool lp_canonicalize_parameter_with_value(const char *parm_name,
                /* parametric option */
                *canon_parm = parm_name;
                *canon_val = val;
-       } else {
-               *canon_parm = parm_table[num].label;
-               if (inverse) {
-                       if (!lp_invert_boolean(val, canon_val)) {
-                               *canon_val = NULL;
-                               return false;
-                       }
-               } else {
-                       *canon_val = val;
+               return true;
+       }
+
+       *canon_parm = parm_table[num].label;
+       if (inverse) {
+               if (!lp_invert_boolean(val, canon_val)) {
+                       *canon_val = NULL;
+                       return false;
                }
+       } else {
+               *canon_val = val;
        }
 
        return true;