a142c87042
gcc has a new warning which caught a bug of int/enum mismatches. And we would crash on some architectures when built with -D_FORTIFY_SOURCE=3 because of our malloc_usable_size() use. This should resolve the build failure in F38 mass build.
32 lines
1.3 KiB
Diff
32 lines
1.3 KiB
Diff
From ba5f7915d25a400f0651bc9e8546a3ec6a738eaa Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crodriguez@owncloud.com>
|
|
Date: Fri, 11 Nov 2022 15:31:18 +0000
|
|
Subject: [PATCH 3/5] resolve: dns_server_feature_level_*_string type is
|
|
DnsServerFeatureLevel
|
|
|
|
gcc 13 -Wenum-int-mismatch reminds us that enum != int
|
|
|
|
(cherry picked from commit e14afe31c3e8380496dc85b57103b2f648bc7d43)
|
|
---
|
|
src/resolve/resolved-dns-server.h | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/resolve/resolved-dns-server.h b/src/resolve/resolved-dns-server.h
|
|
index be9efb0a79..f939b534c3 100644
|
|
--- a/src/resolve/resolved-dns-server.h
|
|
+++ b/src/resolve/resolved-dns-server.h
|
|
@@ -44,8 +44,8 @@ typedef enum DnsServerFeatureLevel {
|
|
#define DNS_SERVER_FEATURE_LEVEL_IS_DNSSEC(x) ((x) >= DNS_SERVER_FEATURE_LEVEL_DO)
|
|
#define DNS_SERVER_FEATURE_LEVEL_IS_UDP(x) IN_SET(x, DNS_SERVER_FEATURE_LEVEL_UDP, DNS_SERVER_FEATURE_LEVEL_EDNS0, DNS_SERVER_FEATURE_LEVEL_DO)
|
|
|
|
-const char* dns_server_feature_level_to_string(int i) _const_;
|
|
-int dns_server_feature_level_from_string(const char *s) _pure_;
|
|
+const char* dns_server_feature_level_to_string(DnsServerFeatureLevel i) _const_;
|
|
+DnsServerFeatureLevel dns_server_feature_level_from_string(const char *s) _pure_;
|
|
|
|
struct DnsServer {
|
|
Manager *manager;
|
|
--
|
|
2.39.1
|
|
|