From 20e5e8ef266709378b239f0338a3ecb2d175e5a4 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 26 Jun 2012 13:32:40 +0200 Subject: s3:net registry import: reduce indentation and untangle assignment from check in import_with_precheck_action(). --- source3/utils/net_registry.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'source3') diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c index 920ddc4fba..5e0e556c22 100644 --- a/source3/utils/net_registry.c +++ b/source3/utils/net_registry.c @@ -1241,13 +1241,18 @@ static int import_with_precheck_action(const char *import_fname, .data = &import_ctx }; int ret = -1; + bool precheck_ok; - if (import_precheck(precheck_fname, parse_options)) { - ret = reg_parse_file(import_fname, - reg_import_adapter(frame, import_callback), - parse_options); + precheck_ok = import_precheck(precheck_fname, parse_options); + if (!precheck_ok) { + goto done; } + ret = reg_parse_file(import_fname, + reg_import_adapter(frame, import_callback), + parse_options); + +done: talloc_free(frame); return ret; } -- cgit