File fix-gcc15.patch of Package containerized-data-importer
From d8fa8122a1f9368ee9f15ab3e3f283223ebd59bf Mon Sep 17 00:00:00 2001
From: "Bernhard M. Wiedemann" <bwiedemann suse de>
Date: Sun, 11 Jan 2026 16:19:51 +0000
Subject: [PATCH] Fix compilation with gcc-15
We need to define proper function prototypes
and get rid of an explicit typecast.
---
vendor/libguestfs.org/libnbd/wrappers.go | 12 ++++++------
vendor/libguestfs.org/libnbd/wrappers.h | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/vendor/libguestfs.org/libnbd/wrappers.go b/vendor/libguestfs.org/libnbd/wrappers.go
index b4798340f..0a1c2bf73 100644
--- a/vendor/libguestfs.org/libnbd/wrappers.go
+++ b/vendor/libguestfs.org/libnbd/wrappers.go
@@ -2050,7 +2050,7 @@ _nbd_chunk_callback_wrapper (void *user_data, const void *subbuf,
size_t count, uint64_t offset, unsigned status,
int *error)
{
- return chunk_callback ((long)user_data, subbuf, count, offset, status, error);
+ return chunk_callback (user_data, subbuf, count, offset, status, error);
}
void
@@ -2065,7 +2065,7 @@ _nbd_chunk_callback_free (void *user_data)
int
_nbd_completion_callback_wrapper (void *user_data, int *error)
{
- return completion_callback ((long)user_data, error);
+ return completion_callback (user_data, error);
}
void
@@ -2081,7 +2081,7 @@ int
_nbd_debug_callback_wrapper (void *user_data, const char *context,
const char *msg)
{
- return debug_callback ((long)user_data, context, msg);
+ return debug_callback (user_data, context, msg);
}
void
@@ -2098,7 +2098,7 @@ _nbd_extent_callback_wrapper (void *user_data, const char *metacontext,
uint64_t offset, uint32_t *entries,
size_t nr_entries, int *error)
{
- return extent_callback ((long)user_data, metacontext, offset, entries, nr_entries, error);
+ return extent_callback (user_data, metacontext, offset, entries, nr_entries, error);
}
void
@@ -2114,7 +2114,7 @@ int
_nbd_list_callback_wrapper (void *user_data, const char *name,
const char *description)
{
- return list_callback ((long)user_data, name, description);
+ return list_callback (user_data, name, description);
}
void
@@ -2129,7 +2129,7 @@ _nbd_list_callback_free (void *user_data)
int
_nbd_context_callback_wrapper (void *user_data, const char *name)
{
- return context_callback ((long)user_data, name);
+ return context_callback (user_data, name);
}
void
diff --git a/vendor/libguestfs.org/libnbd/wrappers.h b/vendor/libguestfs.org/libnbd/wrappers.h
index e0fd0fa1f..b36d9a858 100644
--- a/vendor/libguestfs.org/libnbd/wrappers.h
+++ b/vendor/libguestfs.org/libnbd/wrappers.h
@@ -335,38 +335,38 @@ int _nbd_supports_uri_wrapper (struct error *err,
char * _nbd_get_uri_wrapper (struct error *err,
struct nbd_handle *h);
-extern int chunk_callback ();
+extern int chunk_callback (long int *, void *, size_t, uint64_t, unsigned int, int *);
int _nbd_chunk_callback_wrapper (void *user_data, const void *subbuf,
size_t count, uint64_t offset,
unsigned status, int *error);
void _nbd_chunk_callback_free (void *user_data);
-extern int completion_callback ();
+extern int completion_callback (long int *, int *);
int _nbd_completion_callback_wrapper (void *user_data, int *error);
void _nbd_completion_callback_free (void *user_data);
-extern int debug_callback ();
+extern int debug_callback (long int *, char *, char *);
int _nbd_debug_callback_wrapper (void *user_data, const char *context,
const char *msg);
void _nbd_debug_callback_free (void *user_data);
-extern int extent_callback ();
+extern int extent_callback (long int *, char *, uint64_t, uint32_t *, size_t, int *);
int _nbd_extent_callback_wrapper (void *user_data, const char *metacontext,
uint64_t offset, uint32_t *entries,
size_t nr_entries, int *error);
void _nbd_extent_callback_free (void *user_data);
-extern int list_callback ();
+extern int list_callback (long int *, char *, char *);
int _nbd_list_callback_wrapper (void *user_data, const char *name,
const char *description);
void _nbd_list_callback_free (void *user_data);
-extern int context_callback ();
+extern int context_callback (long int *, char *);
int _nbd_context_callback_wrapper (void *user_data, const char *name);
void _nbd_context_callback_free (void *user_data);
--
2.51.0