From db8e720984269a050a7a78aeb503a7402ef567f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Sun, 1 Jan 2023 22:40:26 +0000 Subject: [PATCH 1/3] basic: fix hosed return value in skip_session() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ../src/basic/cgroup-util.c: In function ‘skip_session’: ../src/basic/cgroup-util.c:1241:32: error: incompatible types when returning type ‘_Bool’ but ‘const char *’ was expected 1241 | return false; --- src/basic/cgroup-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 7949dd7d70..a8e4a1bb2d 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -1238,7 +1238,7 @@ static const char *skip_session(const char *p) { * here. */ if (!session_id_valid(buf)) - return false; + return NULL; p += n; p += strspn(p, "/"); From a4a1569ff1e9ab62996f8b42dcc14a09f91b5715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Mon, 2 Jan 2023 00:06:57 +0000 Subject: [PATCH 2/3] basic: Fix incompatible type for arguments errors in C2X MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC-13 -std=gnu2x FTBS with: error: incompatible type for argument 3 of ‘_hashmap_free’ --- src/basic/hashmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c index cdf7db612c..322b148b31 100644 --- a/src/basic/hashmap.c +++ b/src/basic/hashmap.c @@ -1753,7 +1753,7 @@ HashmapBase* _hashmap_copy(HashmapBase *h HASHMAP_DEBUG_PARAMS) { } if (r < 0) - return _hashmap_free(copy, false, false); + return _hashmap_free(copy, NULL, NULL); return copy; } From 2cc697d7400446a7ea823bc38061501cd85b046a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Mon, 2 Jan 2023 00:08:52 +0000 Subject: [PATCH 3/3] libsystemd-network: FTBS in c2x mode cannot pass false as argument because function wants a pointer to bool instead, use NULL instead --- src/libsystemd-network/sd-dhcp-lease.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c index d9db35fbac..b14ad57071 100644 --- a/src/libsystemd-network/sd-dhcp-lease.c +++ b/src/libsystemd-network/sd-dhcp-lease.c @@ -995,7 +995,7 @@ int dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) { r = sd_dhcp_lease_get_router(lease, &addresses); if (r > 0) { fputs("ROUTER=", f); - serialize_in_addrs(f, addresses, r, false, NULL); + serialize_in_addrs(f, addresses, r, NULL, NULL); fputc('\n', f); } @@ -1030,21 +1030,21 @@ int dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) { r = sd_dhcp_lease_get_dns(lease, &addresses); if (r > 0) { fputs("DNS=", f); - serialize_in_addrs(f, addresses, r, false, NULL); + serialize_in_addrs(f, addresses, r, NULL, NULL); fputc('\n', f); } r = sd_dhcp_lease_get_ntp(lease, &addresses); if (r > 0) { fputs("NTP=", f); - serialize_in_addrs(f, addresses, r, false, NULL); + serialize_in_addrs(f, addresses, r, NULL, NULL); fputc('\n', f); } r = sd_dhcp_lease_get_sip(lease, &addresses); if (r > 0) { fputs("SIP=", f); - serialize_in_addrs(f, addresses, r, false, NULL); + serialize_in_addrs(f, addresses, r, NULL, NULL); fputc('\n', f); }