s3:libsmb: avoid passing a function call as function parameter

Using a helper variable makes it easier to "step" into the desired function
within gdb.

metze

diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 1a09c4168059357f93cc12b1d7b9978e8608a0a1..d7fcc4b4e3c45e6e64906e674fcc408ada20601b 100644 (file)
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -119,9 +119,9 @@ struct link_state {
 
 static void cli_posix_link_internal_done(struct tevent_req *subreq)
 {
-       return tevent_req_simple_finish_ntstatus(
-               subreq, cli_trans_recv(subreq, NULL, NULL, 0, NULL,
-                                      NULL, 0, NULL, NULL, 0, NULL));
+       NTSTATUS status = cli_trans_recv(subreq, NULL, NULL, 0, NULL,
+                                        NULL, 0, NULL, NULL, 0, NULL);
+       return tevent_req_simple_finish_ntstatus(subreq, status);
 }
 
 static struct tevent_req *cli_posix_link_internal_send(TALLOC_CTX *mem_ctx,
@@ -945,9 +945,9 @@ struct ch_state {
 
 static void cli_posix_chown_chmod_internal_done(struct tevent_req *subreq)
 {
-       return tevent_req_simple_finish_ntstatus(
-               subreq, cli_trans_recv(subreq, NULL, NULL, 0, NULL,
-                                      NULL, 0, NULL, NULL, 0, NULL));
+       NTSTATUS status = cli_trans_recv(subreq, NULL, NULL, 0, NULL,
+                                        NULL, 0, NULL, NULL, 0, NULL);
+       return tevent_req_simple_finish_ntstatus(subreq, status);
 }
 
 static struct tevent_req *cli_posix_chown_chmod_internal_send(TALLOC_CTX *mem_ctx,
@@ -1843,9 +1843,9 @@ struct doc_state {
 
 static void cli_nt_delete_on_close_done(struct tevent_req *subreq)
 {
-       return tevent_req_simple_finish_ntstatus(
-               subreq, cli_trans_recv(subreq, NULL, NULL, 0, NULL,
-                                      NULL, 0, NULL, NULL, 0, NULL));
+       NTSTATUS status = cli_trans_recv(subreq, NULL, NULL, 0, NULL,
+                                        NULL, 0, NULL, NULL, 0, NULL);
+       return tevent_req_simple_finish_ntstatus(subreq, status);
 }
 
 struct tevent_req *cli_nt_delete_on_close_send(TALLOC_CTX *mem_ctx,
@@ -2449,9 +2449,9 @@ struct ftrunc_state {
 
 static void cli_ftruncate_done(struct tevent_req *subreq)
 {
-       return tevent_req_simple_finish_ntstatus(
-               subreq, cli_trans_recv(subreq, NULL, NULL, 0, NULL,
-                                      NULL, 0, NULL, NULL, 0, NULL));
+       NTSTATUS status = cli_trans_recv(subreq, NULL, NULL, 0, NULL,
+                                        NULL, 0, NULL, NULL, 0, NULL);
+       return tevent_req_simple_finish_ntstatus(subreq, status);
 }
 
 struct tevent_req *cli_ftruncate_send(TALLOC_CTX *mem_ctx,
@@ -2974,9 +2974,9 @@ struct posix_lock_state {
 
 static void cli_posix_unlock_internal_done(struct tevent_req *subreq)
 {
-       return tevent_req_simple_finish_ntstatus(
-               subreq, cli_trans_recv(subreq, NULL, NULL, 0, NULL,
-                                      NULL, 0, NULL, NULL, 0, NULL));
+       NTSTATUS status = cli_trans_recv(subreq, NULL, NULL, 0, NULL,
+                                        NULL, 0, NULL, NULL, 0, NULL);
+       return tevent_req_simple_finish_ntstatus(subreq, status);
 }
 
 static struct tevent_req *cli_posix_lock_internal_send(TALLOC_CTX *mem_ctx,
@@ -4770,9 +4770,9 @@ struct unlink_state {
 
 static void cli_posix_unlink_internal_done(struct tevent_req *subreq)
 {
-       return tevent_req_simple_finish_ntstatus(
-               subreq, cli_trans_recv(subreq, NULL, NULL, 0, NULL,
-                                      NULL, 0, NULL, NULL, 0, NULL));
+       NTSTATUS status = cli_trans_recv(subreq, NULL, NULL, 0, NULL,
+                                        NULL, 0, NULL, NULL, 0, NULL);
+       return tevent_req_simple_finish_ntstatus(subreq, status);
 }
 
 static struct tevent_req *cli_posix_unlink_internal_send(TALLOC_CTX *mem_ctx,

diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index 6e23dbc689e7bed9b977683edc818433ac6c17c2..00fd47264b2b85bd8e142b928d6812b8d77137eb 100644 (file)
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -206,9 +206,9 @@ struct tevent_req *cli_set_unix_extensions_capabilities_send(
 static void cli_set_unix_extensions_capabilities_done(
        struct tevent_req *subreq)
 {
-       return tevent_req_simple_finish_ntstatus(
-               subreq, cli_trans_recv(subreq, NULL, NULL, 0, NULL,
-                                      NULL, 0, NULL, NULL, 0, NULL));
+       NTSTATUS status = cli_trans_recv(subreq, NULL, NULL, 0, NULL,
+                                        NULL, 0, NULL, NULL, 0, NULL);
+       return tevent_req_simple_finish_ntstatus(subreq, status);
 }
 
 NTSTATUS cli_set_unix_extensions_capabilities_recv(struct tevent_req *req)