summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-11-16 09:59:58 +0100
committerStefan Metzmacher <metze@samba.org>2009-11-16 10:13:05 +0100
commit0762893c48c7f5a6532ee35ad188c80b8a6f3981 (patch)
treef79a2a9d074a6bebcffb086892d4a069f4c2e747
parent88801709781df4fc84bf4b9da12d7f1808bdd86b (diff)
downloadsamba-0762893c48c7f5a6532ee35ad188c80b8a6f3981.tar.gz
samba-0762893c48c7f5a6532ee35ad188c80b8a6f3981.tar.bz2
samba-0762893c48c7f5a6532ee35ad188c80b8a6f3981.zip
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
-rw-r--r--source3/libsmb/clifile.c36
-rw-r--r--source3/libsmb/clifsinfo.c6
2 files changed, 21 insertions, 21 deletions
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 1a09c41680..d7fcc4b4e3 100644
--- 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 6e23dbc689..00fd47264b 100644
--- 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)