Re: [libvirt] [PATCH 1/3] libvirt-domain: Introduce macro to save duplicated codes

Signed-off-by: Wei Jiangang <weijg.fnst(a)cn.fujitsu.com&gt; --- src/libvirt-domain.c | 55 ++++++++++++++-------------------------------------- 1 file changed, 15 insertions(+), 40 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 6e1aacd..ed07c9e 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -33,6 +33,13 @@ VIR_LOG_INIT("libvirt.domain"); #define VIR_FROM_THIS VIR_FROM_DOMAIN +#define VIR_ABSOLUTIZE_PATH(PATH, ABSPATH) \ + if (virFileAbsPath(PATH, ABSPATH) < 0) { \ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", \ + _("could not build absolute input file path")); \

+ goto error; \ + } + /** * virConnectListDomains: @@ -830,11 +837,7 @@ virDomainSave(virDomainPtr domain, const char *to) char *absolute_to; /* We must absolutize the file path as the save is done out of process */ - if (virFileAbsPath(to, &absolute_to) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not build absolute output file path"));

- goto error; - } + VIR_ABSOLUTIZE_PATH(to, &absolute_to); ret = conn->driver->domainSave(domain, absolute_to);

@@ -968,11 +967,7 @@ virDomainRestore(virConnectPtr conn, const char *from) char *absolute_from; /* We must absolutize the file path as the restore is done out of process */ - if (virFileAbsPath(from, &absolute_from) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not build absolute input file path"));

- goto error; - }