vfstest: Convert cmd_rename to synthetic_smb_fname
authorVolker Lendecke <vl@samba.org>
Mon, 15 Apr 2013 09:46:24 +0000 (11:46 +0200)
committerJeremy Allison <jra@samba.org>
Wed, 17 Apr 2013 21:50:03 +0000 (14:50 -0700)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/torture/cmd_vfs.c

index f9c350a9191e2d888b8fd1d3be7b9a325e749a64..868220af1825cd99950122cbaafbb745e531b083 100644 (file)
@@ -550,24 +550,21 @@ static NTSTATUS cmd_rename(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc,
        int ret;
        struct smb_filename *smb_fname_src = NULL;
        struct smb_filename *smb_fname_dst = NULL;
-       NTSTATUS status;
 
        if (argc != 3) {
                printf("Usage: rename <old> <new>\n");
                return NT_STATUS_OK;
        }
 
-       status = create_synthetic_smb_fname_split(mem_ctx, argv[1], NULL,
-                                                 &smb_fname_src);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
+       smb_fname_src = synthetic_smb_fname_split(mem_ctx, argv[1], NULL);
+       if (smb_fname_src == NULL) {
+               return NT_STATUS_NO_MEMORY;
        }
 
-       status = create_synthetic_smb_fname_split(mem_ctx, argv[2], NULL,
-                                                 &smb_fname_dst);
-       if (!NT_STATUS_IS_OK(status)) {
+       smb_fname_dst = synthetic_smb_fname_split(mem_ctx, argv[2], NULL);
+       if (smb_fname_dst == NULL) {
                TALLOC_FREE(smb_fname_src);
-               return status;
+               return NT_STATUS_NO_MEMORY;
        }
 
        ret = SMB_VFS_RENAME(vfs->conn, smb_fname_src, smb_fname_dst);