[libvirt] [PATCH 01/30] storagefile: Make GetMetadataInternal static

Cole Robinson posted 30 patches 6 years, 4 months ago
[libvirt] [PATCH 01/30] storagefile: Make GetMetadataInternal static
Posted by Cole Robinson 6 years, 4 months ago
It is only used in virstoragefile.c

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 src/libvirt_private.syms  | 1 -
 src/util/virstoragefile.c | 2 +-
 src/util/virstoragefile.h | 6 ------
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index eeab820eca..ca9581bd94 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2988,7 +2988,6 @@ virStorageFileGetLVMKey;
 virStorageFileGetMetadata;
 virStorageFileGetMetadataFromBuf;
 virStorageFileGetMetadataFromFD;
-virStorageFileGetMetadataInternal;
 virStorageFileGetNPIVKey;
 virStorageFileGetRelativeBackingPath;
 virStorageFileGetSCSIKey;
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 3201f57e62..51726006e7 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -970,7 +970,7 @@ virStorageFileGetEncryptionPayloadOffset(const struct FileEncryptionInfo *info,
  * Note that this function may be called repeatedly on @meta, so it must
  * clean up any existing allocated memory which would be overwritten.
  */
-int
+static int
 virStorageFileGetMetadataInternal(virStorageSourcePtr meta,
                                   char *buf,
                                   size_t len,
diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 81b83a53ef..2472d89c85 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -346,12 +346,6 @@ struct _virStorageSource {
 
 int virStorageFileProbeFormat(const char *path, uid_t uid, gid_t gid);
 
-int virStorageFileGetMetadataInternal(virStorageSourcePtr meta,
-                                      char *buf,
-                                      size_t len,
-                                      int *backingFormat)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
-
 virStorageSourcePtr virStorageFileGetMetadataFromFD(const char *path,
                                                     int fd,
                                                     int format,
-- 
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 01/30] storagefile: Make GetMetadataInternal static
Posted by Daniel Henrique Barboza 6 years, 4 months ago

On 10/7/19 6:49 PM, Cole Robinson wrote:
> It is only used in virstoragefile.c
>
> Signed-off-by: Cole Robinson <crobinso@redhat.com>
> ---

Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>

>   src/libvirt_private.syms  | 1 -
>   src/util/virstoragefile.c | 2 +-
>   src/util/virstoragefile.h | 6 ------
>   3 files changed, 1 insertion(+), 8 deletions(-)
>
> diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
> index eeab820eca..ca9581bd94 100644
> --- a/src/libvirt_private.syms
> +++ b/src/libvirt_private.syms
> @@ -2988,7 +2988,6 @@ virStorageFileGetLVMKey;
>   virStorageFileGetMetadata;
>   virStorageFileGetMetadataFromBuf;
>   virStorageFileGetMetadataFromFD;
> -virStorageFileGetMetadataInternal;
>   virStorageFileGetNPIVKey;
>   virStorageFileGetRelativeBackingPath;
>   virStorageFileGetSCSIKey;
> diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
> index 3201f57e62..51726006e7 100644
> --- a/src/util/virstoragefile.c
> +++ b/src/util/virstoragefile.c
> @@ -970,7 +970,7 @@ virStorageFileGetEncryptionPayloadOffset(const struct FileEncryptionInfo *info,
>    * Note that this function may be called repeatedly on @meta, so it must
>    * clean up any existing allocated memory which would be overwritten.
>    */
> -int
> +static int
>   virStorageFileGetMetadataInternal(virStorageSourcePtr meta,
>                                     char *buf,
>                                     size_t len,
> diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
> index 81b83a53ef..2472d89c85 100644
> --- a/src/util/virstoragefile.h
> +++ b/src/util/virstoragefile.h
> @@ -346,12 +346,6 @@ struct _virStorageSource {
>   
>   int virStorageFileProbeFormat(const char *path, uid_t uid, gid_t gid);
>   
> -int virStorageFileGetMetadataInternal(virStorageSourcePtr meta,
> -                                      char *buf,
> -                                      size_t len,
> -                                      int *backingFormat)
> -    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
> -
>   virStorageSourcePtr virStorageFileGetMetadataFromFD(const char *path,
>                                                       int fd,
>                                                       int format,

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list