sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

s3:net registry import: reduce indentation and untangle assignment from check

Browse Source 
in import_with_precheck_action().
This commit is contained in:
Michael Adam 2012-06-26 13:32:40 +02:00
parent f9ff84b0b4
commit 20e5e8ef26
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source3/utils/net_registry.c
View File

@ -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;
}