From: Peter Krempa Date: Tue, 20 Jun 2017 14:34:14 +0000 (+0200) Subject: util: storage: Make @backingFormat optional in virStorageFileGetMetadataInternal X-Git-Tag: v3.5.0-rc1~39 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=296a53313f447d2f251cbea2cb050d2f695a7991;p=thirdparty%2Flibvirt.git util: storage: Make @backingFormat optional in virStorageFileGetMetadataInternal Some callers don't need to know the backing format. Make the argument optional by using a dummy int if NULL is passed. --- diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 8047d977f7..7df0fe2db9 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -966,9 +966,13 @@ virStorageFileGetMetadataInternal(virStorageSourcePtr meta, size_t len, int *backingFormat) { + int dummy; int ret = -1; size_t i; + if (!backingFormat) + backingFormat = &dummy; + VIR_DEBUG("path=%s, buf=%p, len=%zu, meta->format=%d", meta->path, buf, len, meta->format); diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index ce54a19cee..0bff8671f7 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -293,7 +293,7 @@ int virStorageFileGetMetadataInternal(virStorageSourcePtr meta, char *buf, size_t len, int *backingFormat) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); virStorageSourcePtr virStorageFileGetMetadataFromFD(const char *path, int fd,