Skip to content

Commit 0c6acda

Browse files
hramrachtyreld
authored andcommitted
nvram.c: Correct librtas function prototypes
Fix build breakage with GCC 15 (which assumes C23) such that and empty argument list is treated as zero arguments rather than an arbitrary number. src/nvram.c: In function ‘dump_rtas_event_entry’: src/nvram.c:932:18: error: too many arguments to function ‘parse_rtas_event’; expected 0, have 2 932 | rtas_event = parse_rtas_event(data, len); | ^~~~~~~~~~~~~~~~ ~~~~ src/nvram.c:938:5: error: too many arguments to function ‘rtas_print_event’; expected 0, have 3 938 | rtas_print_event(stdout, rtas_event, 0); | ^~~~~~~~~~~~~~~~ ~~~~~~ src/nvram.c:940:5: error: too many arguments to function ‘cleanup_rtas_event’; expected 0, have 1 940 | cleanup_rtas_event(rtas_event); | ^~~~~~~~~~~~~~~~~~ ~~~~~~~~~~ In file included from src/vcpustat.c:34: Signed-off-by: Michal Suchanek <[email protected]> [tyreld: add description to commit log] Signed-off-by: Tyrel Datwyler <[email protected]>
1 parent 2a139fc commit 0c6acda

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/nvram.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -886,6 +886,8 @@ dump_errlog(struct nvram *nvram)
886886
return 0;
887887
}
888888

889+
struct rtas_event;
890+
889891
/**
890892
* dump_rtas_event_entry
891893
* @brief Dump event-scan data.
@@ -901,11 +903,11 @@ dump_errlog(struct nvram *nvram)
901903
int
902904
dump_rtas_event_entry(char *data, int len)
903905
{
904-
void *rtas_event;
906+
struct rtas_event *rtas_event;
905907
void *handle;
906-
void *(*parse_rtas_event)();
907-
void (*rtas_print_event)();
908-
void (*cleanup_rtas_event)();
908+
struct rtas_event *(*parse_rtas_event)(char *, int);
909+
int (*rtas_print_event)(FILE *, struct rtas_event *, int);
910+
int (*cleanup_rtas_event)(struct rtas_event *);
909911

910912
handle = dlopen("/usr/lib/librtasevent.so", RTLD_LAZY);
911913
if (handle == NULL)

0 commit comments

Comments
 (0)