646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
diff --git a/1.0.0.rc16/lib/activate/activate.c b/1.0.0.rc16/lib/activate/activate.c
|
|
index 1d71ea8c0a..0a4ec6afa1 100644
|
|
--- a/1.0.0.rc16/lib/activate/activate.c
|
|
+++ b/1.0.0.rc16/lib/activate/activate.c
|
|
@@ -866,7 +866,7 @@
|
|
|
|
#define LIB_NAME_LENGTH 255
|
|
static int
|
|
-do_device(struct lib_context *lc, struct raid_set *rs, int (*f) ())
|
|
+do_device(struct lib_context *lc, struct raid_set *rs, int (*f)(char *, char *))
|
|
{
|
|
int ret = 0;
|
|
char lib_name[LIB_NAME_LENGTH];
|
|
diff --git a/1.0.0.rc16/lib/misc/file.c b/1.0.0.rc16/lib/misc/file.c
|
|
index fe74d5c9c2..c060b6e712 100644
|
|
--- a/1.0.0.rc16/lib/misc/file.c
|
|
+++ b/1.0.0.rc16/lib/misc/file.c
|
|
@@ -59,12 +59,12 @@
|
|
int fd, ret = 0;
|
|
loff_t o;
|
|
struct {
|
|
- ssize_t(*func) ();
|
|
+ ssize_t(*func)(int, void *, size_t);
|
|
const char *what;
|
|
} rw_spec[] = {
|
|
{
|
|
read, "read"}, {
|
|
- write, "writ"},}, *rw = rw_spec + ((flags & O_WRONLY) ? 1 : 0);
|
|
+ (ssize_t(*)(int, void *, size_t))write, "writ"},}, *rw = rw_spec + ((flags & O_WRONLY) ? 1 : 0);
|
|
|
|
if ((fd = open(path, flags, lc->mode)) == -1)
|
|
LOG_ERR(lc, 0, "opening \"%s\"", path);
|
|
|