diff options
| author | Max Reitz <mreitz@redhat.com> | 2019-02-01 20:29:13 +0100 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2019-02-25 15:11:26 +0100 |
| commit | 009b03aaa233ccf5bd3014404995540158d7dc93 (patch) | |
| tree | 5e2705c8175471c53990bea7d4ff154652fdc133 /block | |
| parent | 0f62cd8204163ba082056094a0bcb693faf67bf6 (diff) | |
block: Make path_combine() return the path
Besides being safe for arbitrary path lengths, after some follow-up
patches all callers will want a freshly allocated buffer anyway.
In the meantime, path_combine_deprecated() is added which has the same
interface as path_combine() had before this patch. All callers to that
function will be converted in follow-up patches.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-id: 20190201192935.18394-10-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/vmdk.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/vmdk.c b/block/vmdk.c index 464b718352..32e4e7589a 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -873,8 +873,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, return -EINVAL; } - extent_path = g_malloc0(PATH_MAX); - path_combine(extent_path, PATH_MAX, desc_file_path, fname); + extent_path = path_combine(desc_file_path, fname); ret = snprintf(extent_opt_prefix, 32, "extents.%d", s->num_extents); assert(ret < 32); |