summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2023-06-13 22:24:36 +0000
committerLaurent Bercot <ska@appnovation.com>2023-06-13 22:24:36 +0000
commitf3024f4874b0e57df9a2066f29a128315948cd88 (patch)
tree813db19cd05f36e322e6c10341939f53b745831a
parent148670eded0b74fc237035fe7ca8c72628ed48c7 (diff)
downloadskabus-f3024f4874b0e57df9a2066f29a128315948cd88.tar.xz
Adapt to fixed iter_func type
Signed-off-by: Laurent Bercot <ska@appnovation.com>
-rw-r--r--src/rpc/skabus_rpcd_client.c5
-rw-r--r--src/rpc/skabus_rpcd_interface.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/src/rpc/skabus_rpcd_client.c b/src/rpc/skabus_rpcd_client.c
index a2c27eb..6e6838c 100644
--- a/src/rpc/skabus_rpcd_client.c
+++ b/src/rpc/skabus_rpcd_client.c
@@ -43,10 +43,9 @@ static inline void client_delete (uint32_t i, uint32_t prev)
genset_delete(clients, i) ;
}
-static int query_cancelremove_iter (char *s, void *reason)
+static int query_cancelremove_iter (void *s, void *reason)
{
- uint32_t i = *(uint32_t *)s ;
- return query_cancelremove(i, *(unsigned char *)reason) ;
+ return query_cancelremove(*(uint32_t *)s, *(unsigned char *)reason) ;
}
void client_remove (uint32_t i, uint32_t prev)
diff --git a/src/rpc/skabus_rpcd_interface.c b/src/rpc/skabus_rpcd_interface.c
index 600b91a..d5838d6 100644
--- a/src/rpc/skabus_rpcd_interface.c
+++ b/src/rpc/skabus_rpcd_interface.c
@@ -44,10 +44,9 @@ static inline void interface_delete (uint32_t i)
strerr_diefu1sys(111, "gensetdyn_delete in interface_delete") ;
}
-static int query_fail_iter (char *s, void *reason)
+static int query_fail_iter (void *s, void *reason)
{
- uint32_t i = *(uint32_t *)s ;
- query_fail(i, *(unsigned char *)reason) ;
+ query_fail(*(uint32_t *)s, *(unsigned char *)reason) ;
return 1 ;
}