libsmb: Reformat the cli_smb2_create_fnum_send args

We'll add parameters in the next commit, make that commit a bit more obvious

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/examples/fuse/clifuse.c b/examples/fuse/clifuse.c
index b724e642d4b46f547380b11b95f17648ff151879..3814c9801dd92b916f10871b724b694cc9eda972 100644 (file)
--- a/examples/fuse/clifuse.c
+++ b/examples/fuse/clifuse.c
@@ -150,11 +150,16 @@ static void cli_ll_create(fuse_req_t freq, fuse_ino_t parent, const char *name,
        }
 
        req = cli_smb2_create_fnum_send(
-               state, mstate->ev, mstate->cli, state->path,
-               0, SMB2_IMPERSONATION_IMPERSONATION,
-               FILE_GENERIC_READ|FILE_GENERIC_WRITE, FILE_ATTRIBUTE_NORMAL,
+               state,
+               mstate->ev,
+               mstate->cli, state->path,
+               0,
+               SMB2_IMPERSONATION_IMPERSONATION,
+               FILE_GENERIC_READ|FILE_GENERIC_WRITE,
+               FILE_ATTRIBUTE_NORMAL,
                FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
-               FILE_CREATE, FILE_NON_DIRECTORY_FILE);
+               FILE_CREATE,
+               FILE_NON_DIRECTORY_FILE);
        if (req == NULL) {
                TALLOC_FREE(state);
                fuse_reply_err(freq, ENOMEM);
@@ -836,11 +841,17 @@ static void cli_ll_open(fuse_req_t freq, fuse_ino_t ino,
        }
 
        req = cli_smb2_create_fnum_send(
-               state, mstate->ev, mstate->cli, istate->path,
-               0, SMB2_IMPERSONATION_IMPERSONATION,
-               acc, FILE_ATTRIBUTE_NORMAL,
+               state,
+               mstate->ev,
+               mstate->cli,
+               istate->path,
+               0,
+               SMB2_IMPERSONATION_IMPERSONATION,
+               acc,
+               FILE_ATTRIBUTE_NORMAL,
                FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
-               FILE_OPEN, FILE_NON_DIRECTORY_FILE);
+               FILE_OPEN,
+               FILE_NON_DIRECTORY_FILE);
        if (req == NULL) {
                TALLOC_FREE(state);
                fuse_reply_err(freq, ENOMEM);

diff --git a/source3/libsmb/cli_smb2_fnum.c b/source3/libsmb/cli_smb2_fnum.c
index e7b89a44e58ea2eea9f96a8586b25ddde9ab44d0..8122cd6cb3039324c479a501c962005e9c2e9c13 100644 (file)
--- a/source3/libsmb/cli_smb2_fnum.c
+++ b/source3/libsmb/cli_smb2_fnum.c
@@ -166,17 +166,18 @@ struct cli_smb2_create_fnum_state {
 static void cli_smb2_create_fnum_done(struct tevent_req *subreq);
 static bool cli_smb2_create_fnum_cancel(struct tevent_req *req);
 
-struct tevent_req *cli_smb2_create_fnum_send(TALLOC_CTX *mem_ctx,
-                                            struct tevent_context *ev,
-                                            struct cli_state *cli,
-                                            const char *fname,
-                                            uint32_t create_flags,
-                                            uint32_t impersonation_level,
-                                            uint32_t desired_access,
-                                            uint32_t file_attributes,
-                                            uint32_t share_access,
-                                            uint32_t create_disposition,
-                                            uint32_t create_options)
+struct tevent_req *cli_smb2_create_fnum_send(
+       TALLOC_CTX *mem_ctx,
+       struct tevent_context *ev,
+       struct cli_state *cli,
+       const char *fname,
+       uint32_t create_flags,
+       uint32_t impersonation_level,
+       uint32_t desired_access,
+       uint32_t file_attributes,
+       uint32_t share_access,
+       uint32_t create_disposition,
+       uint32_t create_options)
 {
        struct tevent_req *req, *subreq;
        struct cli_smb2_create_fnum_state *state;
@@ -332,17 +333,18 @@ NTSTATUS cli_smb2_create_fnum_recv(struct tevent_req *req, uint16_t *pfnum,
        return NT_STATUS_OK;
 }
 
-NTSTATUS cli_smb2_create_fnum(struct cli_state *cli,
-                       const char *fname,
-                       uint32_t create_flags,
-                       uint32_t impersonation_level,
-                       uint32_t desired_access,
-                       uint32_t file_attributes,
-                       uint32_t share_access,
-                       uint32_t create_disposition,
-                       uint32_t create_options,
-                       uint16_t *pfid,
-                       struct smb_create_returns *cr)
+NTSTATUS cli_smb2_create_fnum(
+       struct cli_state *cli,
+       const char *fname,
+       uint32_t create_flags,
+       uint32_t impersonation_level,
+       uint32_t desired_access,
+       uint32_t file_attributes,
+       uint32_t share_access,
+       uint32_t create_disposition,
+       uint32_t create_options,
+       uint16_t *pfid,
+       struct smb_create_returns *cr)
 {
        TALLOC_CTX *frame = talloc_stackframe();
        struct tevent_context *ev;
@@ -360,11 +362,18 @@ NTSTATUS cli_smb2_create_fnum(struct cli_state *cli,
        if (ev == NULL) {
                goto fail;
        }
-       req = cli_smb2_create_fnum_send(frame, ev, cli, fname, create_flags,
-                                       impersonation_level,
-                                       desired_access, file_attributes,
-                                       share_access, create_disposition,
-                                       create_options);
+       req = cli_smb2_create_fnum_send(
+               frame,
+               ev,
+               cli,
+               fname,
+               create_flags,
+               impersonation_level,
+               desired_access,
+               file_attributes,
+               share_access,
+               create_disposition,
+               create_options);
        if (req == NULL) {
                goto fail;
        }

diff --git a/source3/libsmb/cli_smb2_fnum.h b/source3/libsmb/cli_smb2_fnum.h
index 921dc71d9ebaf07a42d0797dcaee1e6946071c75..9dfa93eab666ec33127a984078c18ac1746ed367 100644 (file)
--- a/source3/libsmb/cli_smb2_fnum.h
+++ b/source3/libsmb/cli_smb2_fnum.h
@@ -25,30 +25,32 @@ struct smbXcli_session;
 struct cli_state;
 struct file_info;
 
-struct tevent_req *cli_smb2_create_fnum_send(TALLOC_CTX *mem_ctx,
-                                            struct tevent_context *ev,
-                                            struct cli_state *cli,
-                                            const char *fname,
-                                            uint32_t create_flags,
-                                            uint32_t impersonation_level,
-                                            uint32_t desired_access,
-                                            uint32_t file_attributes,
-                                            uint32_t share_access,
-                                            uint32_t create_disposition,
-                                            uint32_t create_options);
+struct tevent_req *cli_smb2_create_fnum_send(
+       TALLOC_CTX *mem_ctx,
+       struct tevent_context *ev,
+       struct cli_state *cli,
+       const char *fname,
+       uint32_t create_flags,
+       uint32_t impersonation_level,
+       uint32_t desired_access,
+       uint32_t file_attributes,
+       uint32_t share_access,
+       uint32_t create_disposition,
+       uint32_t create_options);
 NTSTATUS cli_smb2_create_fnum_recv(struct tevent_req *req, uint16_t *pfnum,
                                   struct smb_create_returns *cr);
-NTSTATUS cli_smb2_create_fnum(struct cli_state *cli,
-                       const char *fname,
-                       uint32_t create_flags,
-                       uint32_t impersonation_level,
-                       uint32_t desired_access,
-                       uint32_t file_attributes,
-                       uint32_t share_access,
-                       uint32_t create_disposition,
-                       uint32_t create_options,
-                       uint16_t *pfid,
-                       struct smb_create_returns *cr);
+NTSTATUS cli_smb2_create_fnum(
+       struct cli_state *cli,
+       const char *fname,
+       uint32_t create_flags,
+       uint32_t impersonation_level,
+       uint32_t desired_access,
+       uint32_t file_attributes,
+       uint32_t share_access,
+       uint32_t create_disposition,
+       uint32_t create_options,
+       uint16_t *pfid,
+       struct smb_create_returns *cr);
 
 struct tevent_req *cli_smb2_close_fnum_send(TALLOC_CTX *mem_ctx,
                                            struct tevent_context *ev,

diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index 833db0ac9254762f20ad8a1e0b25f13b5fb18e4f..6940858c6406c4cf717f916793a42b8f673d4553 100644 (file)
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -2115,9 +2115,16 @@ struct tevent_req *cli_ntcreate_send(TALLOC_CTX *mem_ctx,
                }
 
                subreq = cli_smb2_create_fnum_send(
-                       state, ev, cli, fname, create_flags,
-                       impersonation_level, desired_access,
-                       file_attributes, share_access, create_disposition,
+                       state,
+                       ev,
+                       cli,
+                       fname,
+                       create_flags,
+                       impersonation_level,
+                       desired_access,
+                       file_attributes,
+                       share_access,
+                       create_disposition,
                        create_options);
                if (tevent_req_nomem(subreq, req)) {
                        return tevent_req_post(req, ev);