]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
vfs_fruit: Introduce two helper variables
authorVolker Lendecke <vl@samba.org>
Sat, 3 Jan 2026 14:48:16 +0000 (15:48 +0100)
committerVolker Lendecke <vl@samba.org>
Tue, 20 Jan 2026 11:53:34 +0000 (11:53 +0000)
Makes it a bit easier to read for me.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Anoop C S <anoopcs@samba.org>
source3/modules/vfs_fruit.c

index 6a738366e685f89400f196e27e207324c9238024..3820833f0d92b118bdb805ee15a00da07a11590c 100644 (file)
@@ -4936,6 +4936,8 @@ static void fruit_offload_write_done(struct tevent_req *subreq)
        unsigned int num_streams = 0;
        struct stream_struct *streams = NULL;
        unsigned int i;
+       struct smb_filename *src_fname = NULL;
+       struct smb_filename *dst_fname = NULL;
 
        status = SMB_VFS_NEXT_OFFLOAD_WRITE_RECV(state->handle,
                                              subreq,
@@ -4967,6 +4969,9 @@ static void fruit_offload_write_done(struct tevent_req *subreq)
                return;
        }
 
+       src_fname = state->src_fsp->fsp_name;
+       dst_fname = state->dst_fsp->fsp_name;
+
        for (i = 0; i < num_streams; i++) {
                struct smb_filename *src_fname_tmp = NULL;
                struct smb_filename *dst_fname_tmp = NULL;
@@ -4976,13 +4981,12 @@ static void fruit_offload_write_done(struct tevent_req *subreq)
                          stream,
                          (size_t)streams[i].size);
 
-               src_fname_tmp = synthetic_smb_fname(
-                       streams,
-                       state->src_fsp->fsp_name->base_name,
-                       stream,
-                       NULL,
-                       state->src_fsp->fsp_name->twrp,
-                       state->src_fsp->fsp_name->flags);
+               src_fname_tmp = synthetic_smb_fname(streams,
+                                                   src_fname->base_name,
+                                                   stream,
+                                                   NULL,
+                                                   src_fname->twrp,
+                                                   src_fname->flags);
                if (tevent_req_nomem(src_fname_tmp, req)) {
                        TALLOC_FREE(streams);
                        return;
@@ -4993,13 +4997,12 @@ static void fruit_offload_write_done(struct tevent_req *subreq)
                        continue;
                }
 
-               dst_fname_tmp = synthetic_smb_fname(
-                       streams,
-                       state->dst_fsp->fsp_name->base_name,
-                       stream,
-                       NULL,
-                       state->dst_fsp->fsp_name->twrp,
-                       state->dst_fsp->fsp_name->flags);
+               dst_fname_tmp = synthetic_smb_fname(streams,
+                                                   dst_fname->base_name,
+                                                   stream,
+                                                   NULL,
+                                                   dst_fname->twrp,
+                                                   dst_fname->flags);
                if (tevent_req_nomem(dst_fname_tmp, req)) {
                        TALLOC_FREE(streams);
                        return;