diff options
| author | Volker Lendecke <vl@samba.org> | 2015-01-28 16:16:32 +0000 |
|---|---|---|
| committer | Garming Sam <garming@samba.org> | 2015-01-29 00:28:55 +0100 |
| commit | ce909f2ce17e410c223a7e76cf4edc52a71aa663 (patch) | |
| tree | 45141a015c581f72492ca616bef0bacc32db024c /lib | |
| parent | 62671ad7b2985912410a5ae5ed7de2fa3b672e69 (diff) | |
| download | samba-ce909f2ce17e410c223a7e76cf4edc52a71aa663.tar.gz samba-ce909f2ce17e410c223a7e76cf4edc52a71aa663.tar.xz samba-ce909f2ce17e410c223a7e76cf4edc52a71aa663.zip | |
loadparm: Simplify "set_variable"
I usually don't like complicated if/else and in particular the else
piece. But if the alternative is a goto, then else is better I guess :-)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Autobuild-User(master): Garming Sam <garming@samba.org>
Autobuild-Date(master): Thu Jan 29 00:28:55 CET 2015 on sn-devel-104
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/param/loadparm.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index bfa9c7b61f..115575c9c3 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -1567,19 +1567,15 @@ bool set_variable(TALLOC_CTX *mem_ctx, struct loadparm_service *service, int par if (parm_table[parmnum].special) { ok = parm_table[parmnum].special(lp_ctx, service, pszParmValue, (char **)parm_ptr); - if (!ok) { - return false; - } - goto mark_non_default; + } else { + ok = set_variable_helper(mem_ctx, parmnum, parm_ptr, + pszParmName, pszParmValue); } - ok = set_variable_helper(mem_ctx, parmnum, parm_ptr, pszParmName, pszParmValue); - if (!ok) { return false; } -mark_non_default: if (on_globals && (lp_ctx->flags[parmnum] & FLAG_DEFAULT)) { lp_ctx->flags[parmnum] &= ~FLAG_DEFAULT; /* we have to also unset FLAG_DEFAULT on aliases */ |