From 454d50319a59bfe31502440800d4a40ec8bc9eab Mon Sep 17 00:00:00 2001 From: Connor Gibson Date: Sat, 7 Jun 2025 15:02:05 -0700 Subject: [PATCH 1/2] Add void argument list for `void GetRP1Memory(void)` Function definitions without an argument list are disallowed in C23. Removed dropped arguments in later call to function. --- wiringPi/wiringPi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c index 5bbe5b3..2065463 100644 --- a/wiringPi/wiringPi.c +++ b/wiringPi/wiringPi.c @@ -3326,8 +3326,7 @@ int CheckPCIeFileContent(const char* pcieaddress, const char* filename, const ch } -void GetRP1Memory() { - +void GetRP1Memory(void) { pciemem_RP1[0] = '\0'; DIR *dir = opendir(pcie_path); struct dirent *entry; @@ -3360,7 +3359,7 @@ int wiringPiGlobalMemoryAccess(void) piBoard(); if (piRP1Model()) { - GetRP1Memory(pciemem_RP1, sizeof(pciemem_RP1)); + GetRP1Memory(); gpiomemGlobal = pciemem_RP1; MMAP_size = pciemem_RP1_Size; BaseAddr = 0x00000000; From b243be74d4381fea3e807be8b99c894958e8ddd9 Mon Sep 17 00:00:00 2001 From: Connor Gibson Date: Sat, 7 Jun 2025 15:03:29 -0700 Subject: [PATCH 2/2] Swap out-of-order arguments to calloc --- wiringPi/wiringPi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c index 2065463..9381df9 100644 --- a/wiringPi/wiringPi.c +++ b/wiringPi/wiringPi.c @@ -1688,7 +1688,7 @@ struct wiringPiNodeStruct *wiringPiNewNode (int pinBase, int numPins) if (wiringPiFindNode (pin) != NULL) (void)wiringPiFailure (WPI_FATAL, "wiringPiNewNode: Pin %d overlaps with existing definition\n", pin) ; - node = (struct wiringPiNodeStruct *)calloc (sizeof (struct wiringPiNodeStruct), 1) ; // calloc zeros + node = (struct wiringPiNodeStruct *)calloc(1, sizeof (struct wiringPiNodeStruct)); // calloc zeros if (node == NULL) (void)wiringPiFailure (WPI_FATAL, "wiringPiNewNode: Unable to allocate memory: %s\n", strerror (errno)) ;