From 009b03aaa233ccf5bd3014404995540158d7dc93 Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Fri, 1 Feb 2019 20:29:13 +0100 Subject: 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 Reviewed-by: Alberto Garcia Reviewed-by: Kevin Wolf Message-id: 20190201192935.18394-10-mreitz@redhat.com Signed-off-by: Max Reitz --- include/block/block.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'include/block') diff --git a/include/block/block.h b/include/block/block.h index aaae900925..e233372a3a 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -496,9 +496,7 @@ void bdrv_get_full_backing_filename_from_filename(const char *backed, int path_has_protocol(const char *path); int path_is_absolute(const char *path); -void path_combine(char *dest, int dest_size, - const char *base_path, - const char *filename); +char *path_combine(const char *base_path, const char *filename); int bdrv_readv_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos); int bdrv_writev_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos); -- cgit v1.2.3-55-g7522