summaryrefslogtreecommitdiffstats
path: root/source4/wrepl_server/wrepl_in_call.c
diff options
context:
space:
mode:
authorGarming Sam <garming@catalyst.net.nz>2014-02-14 18:04:22 +1300
committerAndreas Schneider <asn@cryptomilk.org>2014-03-05 16:33:22 +0100
commit0b8213ae1cd0129b7a50cf7ba3605512a990520f (patch)
treee30b7e9f85f1f391060101a833928904f44dbed0 /source4/wrepl_server/wrepl_in_call.c
parent856c74e013eaa53902479b771e6c0cf1fea67745 (diff)
downloadsamba-0b8213ae1cd0129b7a50cf7ba3605512a990520f.tar.gz
samba-0b8213ae1cd0129b7a50cf7ba3605512a990520f.tar.xz
samba-0b8213ae1cd0129b7a50cf7ba3605512a990520f.zip
Remove all uses of the NT_STATUS_NOT_OK_RETURN_AND_FREE macro from the codebase.
Following the current coding guidelines, it is considered bad practice to return from within a macro and change control flow as they look like normal function calls. Change-Id: I421e169275fe323e2b019c6cc5d386289aec07f7 Signed-off-by: Garming Sam <garming@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source4/wrepl_server/wrepl_in_call.c')
-rw-r--r--source4/wrepl_server/wrepl_in_call.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/wrepl_server/wrepl_in_call.c b/source4/wrepl_server/wrepl_in_call.c
index 111d9a405ad..9fc723fd31e 100644
--- a/source4/wrepl_server/wrepl_in_call.c
+++ b/source4/wrepl_server/wrepl_in_call.c
@@ -369,7 +369,10 @@ static NTSTATUS wreplsrv_in_update(struct wreplsrv_in_call *call)
TALLOC_FREE(wrepl_in->send_queue);
status = wrepl_socket_donate_stream(wrepl_out->sock, &wrepl_in->tstream);
- NT_STATUS_NOT_OK_RETURN_AND_FREE(status, update_state);
+ if (!NT_STATUS_IS_OK(status)) {
+ TALLOC_FREE(update_state);
+ return status;
+ }
update_state->wrepl_in = wrepl_in;
update_state->wrepl_out = wrepl_out;