09b45f4f90
With gcc 15-20241117 compile fails with the below error, update the
do_version declaration to match the header in command.h
../../parted/parted.c: In function '_init_commands':
../../parted/parted.c:2469:9: error: passing argument 2 of 'command_create' from incompatible pointer type [-Wincompatible-pointer-types]
2469 | do_version,
| ^~~~~~~~~~
| |
| int (*)(void)
In file included from ../../parted/parted.c:28:
../../parted/command.h:35:39: note: expected 'int (*)(PedDevice **, PedDisk **)' {aka 'int (*)(struct _PedDevice **, struct _PedDisk **)'} but argument is of type 'int (*)(void)'
35 | int (*method) (PedDevice** dev, PedDisk** diskp),
| ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Upstream: https://cgit.git.savannah.gnu.org/cgit/parted.git/commit/?id=16343bda6ce0d41edf43f8dac368db3bbb63d271
Fixes:
https://autobuild.buildroot.org/results/283f52d50ffef91d82a1bdc1f4dde1d54c5ffc23/build-end.log
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
[Julien: reword commit title]
Signed-off-by: Julien Olivain <ju.o@free.fr>
(cherry picked from commit 14b5a19486)
Signed-off-by: Thomas Perale <thomas.perale@mind.be>
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
From 16343bda6ce0d41edf43f8dac368db3bbb63d271 Mon Sep 17 00:00:00 2001
|
|
From: Rudi Heitbaum <rudi@heitbaum.com>
|
|
Date: Wed, 20 Nov 2024 12:22:22 +0000
|
|
Subject: [PATCH] bug#74444: [PATCH] parted: fix do_version declaration
|
|
|
|
With gcc 15-20241117 compile fails with the below error, update the
|
|
do_version declaration to match the header in command.h
|
|
|
|
../../parted/parted.c: In function '_init_commands':
|
|
../../parted/parted.c:2469:9: error: passing argument 2 of 'command_create' from incompatible pointer type [-Wincompatible-pointer-types]
|
|
2469 | do_version,
|
|
| ^~~~~~~~~~
|
|
| |
|
|
| int (*)(void)
|
|
In file included from ../../parted/parted.c:28:
|
|
../../parted/command.h:35:39: note: expected 'int (*)(PedDevice **, PedDisk **)' {aka 'int (*)(struct _PedDevice **, struct _PedDisk **)'} but argument is of type 'int (*)(void)'
|
|
35 | int (*method) (PedDevice** dev, PedDisk** diskp),
|
|
| ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
Upstream: https://cgit.git.savannah.gnu.org/cgit/parted.git/commit/?id=16343bda6ce0d41edf43f8dac368db3bbb63d271
|
|
|
|
Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
|
|
Signed-off-by: Brian C. Lane <bcl@redhat.com>
|
|
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
|
|
---
|
|
parted/parted.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/parted/parted.c b/parted/parted.c
|
|
index 3abb52f..fc2aeba 100644
|
|
--- a/parted/parted.c
|
|
+++ b/parted/parted.c
|
|
@@ -2172,7 +2172,7 @@ do_unit (PedDevice** dev, PedDisk** diskp)
|
|
}
|
|
|
|
static int
|
|
-do_version ()
|
|
+do_version (PedDevice** dev, PedDisk** diskp)
|
|
{
|
|
printf ("\n%s\n%s",
|
|
prog_name,
|
|
--
|
|
2.34.1
|
|
|