[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 23/23] tests/9p: remove unnecessary g_strdup() calls
From: |
Christian Schoenebeck |
Subject: |
[PULL 23/23] tests/9p: remove unnecessary g_strdup() calls |
Date: |
Mon, 24 Oct 2022 12:54:23 +0200 |
This is a leftover from before the recent function merge and
refactoring patches:
As these functions do not return control to the caller in
between, it is not necessary to duplicate strings passed to them.
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Message-Id:
<0f80141cde3904ed0591354059da49d1d60bcdbc.1664917004.git.qemu_oss@crudebyte.com>
---
tests/qtest/libqos/virtio-9p-client.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/tests/qtest/libqos/virtio-9p-client.c
b/tests/qtest/libqos/virtio-9p-client.c
index e017e030ec..e4a368e036 100644
--- a/tests/qtest/libqos/virtio-9p-client.c
+++ b/tests/qtest/libqos/virtio-9p-client.c
@@ -770,7 +770,6 @@ TMkdirRes v9fs_tmkdir(TMkdirOpt opt)
{
P9Req *req;
uint32_t err;
- g_autofree char *name = g_strdup(opt.name);
g_assert(opt.client);
/* expecting either hi-level atPath or low-level dfid, but not both */
@@ -788,14 +787,14 @@ TMkdirRes v9fs_tmkdir(TMkdirOpt opt)
}
uint32_t body_size = 4 + 4 + 4;
- uint16_t string_size = v9fs_string_size(name);
+ uint16_t string_size = v9fs_string_size(opt.name);
g_assert_cmpint(body_size, <=, UINT32_MAX - string_size);
body_size += string_size;
req = v9fs_req_init(opt.client, body_size, P9_TMKDIR, opt.tag);
v9fs_uint32_write(req, opt.dfid);
- v9fs_string_write(req, name);
+ v9fs_string_write(req, opt.name);
v9fs_uint32_write(req, opt.mode);
v9fs_uint32_write(req, opt.gid);
v9fs_req_send(req);
@@ -831,7 +830,6 @@ TlcreateRes v9fs_tlcreate(TlcreateOpt opt)
{
P9Req *req;
uint32_t err;
- g_autofree char *name = g_strdup(opt.name);
g_assert(opt.client);
/* expecting either hi-level atPath or low-level fid, but not both */
@@ -849,14 +847,14 @@ TlcreateRes v9fs_tlcreate(TlcreateOpt opt)
}
uint32_t body_size = 4 + 4 + 4 + 4;
- uint16_t string_size = v9fs_string_size(name);
+ uint16_t string_size = v9fs_string_size(opt.name);
g_assert_cmpint(body_size, <=, UINT32_MAX - string_size);
body_size += string_size;
req = v9fs_req_init(opt.client, body_size, P9_TLCREATE, opt.tag);
v9fs_uint32_write(req, opt.fid);
- v9fs_string_write(req, name);
+ v9fs_string_write(req, opt.name);
v9fs_uint32_write(req, opt.flags);
v9fs_uint32_write(req, opt.mode);
v9fs_uint32_write(req, opt.gid);
@@ -896,8 +894,6 @@ TsymlinkRes v9fs_tsymlink(TsymlinkOpt opt)
{
P9Req *req;
uint32_t err;
- g_autofree char *name = g_strdup(opt.name);
- g_autofree char *symtgt = g_strdup(opt.symtgt);
g_assert(opt.client);
/* expecting either hi-level atPath or low-level fid, but not both */
@@ -911,15 +907,16 @@ TsymlinkRes v9fs_tsymlink(TsymlinkOpt opt)
}
uint32_t body_size = 4 + 4;
- uint16_t string_size = v9fs_string_size(name) + v9fs_string_size(symtgt);
+ uint16_t string_size = v9fs_string_size(opt.name) +
+ v9fs_string_size(opt.symtgt);
g_assert_cmpint(body_size, <=, UINT32_MAX - string_size);
body_size += string_size;
req = v9fs_req_init(opt.client, body_size, P9_TSYMLINK, opt.tag);
v9fs_uint32_write(req, opt.fid);
- v9fs_string_write(req, name);
- v9fs_string_write(req, symtgt);
+ v9fs_string_write(req, opt.name);
+ v9fs_string_write(req, opt.symtgt);
v9fs_uint32_write(req, opt.gid);
v9fs_req_send(req);
--
2.30.2
- [PULL 09/23] tests/9p: convert v9fs_tgetattr() to declarative arguments, (continued)
- [PULL 09/23] tests/9p: convert v9fs_tgetattr() to declarative arguments, Christian Schoenebeck, 2022/10/24
- [PULL 13/23] tests/9p: convert v9fs_tlopen() to declarative arguments, Christian Schoenebeck, 2022/10/24
- [PULL 15/23] tests/9p: convert v9fs_twrite() to declarative arguments, Christian Schoenebeck, 2022/10/24
- [PULL 14/23] tests/9p: simplify callers of tlopen(), Christian Schoenebeck, 2022/10/24
- [PULL 16/23] tests/9p: simplify callers of twrite(), Christian Schoenebeck, 2022/10/24
- [PULL 17/23] tests/9p: convert v9fs_tflush() to declarative arguments, Christian Schoenebeck, 2022/10/24
- [PULL 18/23] tests/9p: merge v9fs_tmkdir() and do_mkdir(), Christian Schoenebeck, 2022/10/24
- [PULL 19/23] tests/9p: merge v9fs_tlcreate() and do_lcreate(), Christian Schoenebeck, 2022/10/24
- [PULL 20/23] tests/9p: merge v9fs_tsymlink() and do_symlink(), Christian Schoenebeck, 2022/10/24
- [PULL 21/23] tests/9p: merge v9fs_tlink() and do_hardlink(), Christian Schoenebeck, 2022/10/24
- [PULL 23/23] tests/9p: remove unnecessary g_strdup() calls,
Christian Schoenebeck <=
- [PULL 22/23] tests/9p: merge v9fs_tunlinkat() and do_unlinkat(), Christian Schoenebeck, 2022/10/24
- Re: [PULL 00/23] 9p queue 2022-10-24, Christian Schoenebeck, 2022/10/24
- Re: [PULL 00/23] 9p queue 2022-10-24, Stefan Hajnoczi, 2022/10/25
- Re: [PULL 00/23] 9p queue 2022-10-24, Thomas Huth, 2022/10/27
- Re: [PULL 00/23] 9p queue 2022-10-24, Christian Schoenebeck, 2022/10/27
- Re: [PULL 00/23] 9p queue 2022-10-24, Stefan Hajnoczi, 2022/10/27
- Re: [PULL 00/23] 9p queue 2022-10-24, Christian Schoenebeck, 2022/10/27
- Re: [PULL 00/23] 9p queue 2022-10-24, Warner Losh, 2022/10/27
- Re: [PULL 00/23] 9p queue 2022-10-24, Thomas Huth, 2022/10/28
- Re: [PULL 00/23] 9p queue 2022-10-24, Christian Schoenebeck, 2022/10/28