commit fdd5e90fdb4de364e12cc2722993c8f14784e7a4
author Philippe Mathieu-Daudé <philmd@linaro.org> Mon Mar 20 16:26:10 2023 +0100
committer Stefan Hajnoczi <stefanha@redhat.com> Mon Apr 24 13:53:44 2023 -0400
tree 269b4669b2c38b3fc5cf27a86af3e5d67baf2d6e
parent ac5f7bf8e208cd7893dbb1a9520559e569a4677c

block/dmg: Declare a type definition for DMG uncompress function

Introduce the BdrvDmgUncompressFunc type defintion. To emphasis
dmg_uncompress_bz2 and dmg_uncompress_lzfse are pointer to functions,
declare them using this new typedef.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20230320152610.32052-1-philmd@linaro.org
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

block/dmg.c

diff --git a/block/dmg.c b/block/dmg.c
index e10b9a2..2769900 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -31,11 +31,8 @@
 #include "qemu/memalign.h"
 #include "dmg.h"
 
-int (*dmg_uncompress_bz2)(char *next_in, unsigned int avail_in,
-                          char *next_out, unsigned int avail_out);
-
-int (*dmg_uncompress_lzfse)(char *next_in, unsigned int avail_in,
-                            char *next_out, unsigned int avail_out);
+BdrvDmgUncompressFunc *dmg_uncompress_bz2;
+BdrvDmgUncompressFunc *dmg_uncompress_lzfse;
 
 enum {
     /* Limit chunk sizes to prevent unreasonable amounts of memory being used

block/dmg.h

diff --git a/block/dmg.h b/block/dmg.h
index e488601..dcd6165 100644
--- a/block/dmg.h
+++ b/block/dmg.h
@@ -51,10 +51,10 @@
     z_stream zstream;
 } BDRVDMGState;
 
-extern int (*dmg_uncompress_bz2)(char *next_in, unsigned int avail_in,
-                                 char *next_out, unsigned int avail_out);
+typedef int BdrvDmgUncompressFunc(char *next_in, unsigned int avail_in,
+                                  char *next_out, unsigned int avail_out);
 
-extern int (*dmg_uncompress_lzfse)(char *next_in, unsigned int avail_in,
-                                   char *next_out, unsigned int avail_out);
+extern BdrvDmgUncompressFunc *dmg_uncompress_bz2;
+extern BdrvDmgUncompressFunc *dmg_uncompress_lzfse;
 
 #endif