diff mbox series

[3/3] Fix gcc -Werror=enum-int-mismatch

Message ID 20230712083804.2581833-3-arthur@aheymans.com
State Rejected
Headers show
Series [1/3] acpi/spcr: Update supported port types | expand

Commit Message

Arthur Heymans July 12, 2023, 8:37 a.m. UTC
From: Arthur Heymans <arthur@aheymans.xyz>

GCC 13 added a warning about mismatches between an enumerated type and
an integer type in declarations.

Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
---
 src/lib/include/fwts_cpu.h       | 2 +-
 src/lib/include/fwts_memorymap.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Ivan Hu July 17, 2023, 4:08 a.m. UTC | #1
the related patch has been applied,

https://lists.ubuntu.com/archives/fwts-devel/2023-June/013638.html

Nacked-by: Ivan Hu <ivan.hu@canonical.com>



On 7/12/23 16:37, arthur@aheymans.xyz wrote:
> From: Arthur Heymans <arthur@aheymans.xyz>
> 
> GCC 13 added a warning about mismatches between an enumerated type and
> an integer type in declarations.
> 
> Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
> ---
>   src/lib/include/fwts_cpu.h       | 2 +-
>   src/lib/include/fwts_memorymap.h | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/lib/include/fwts_cpu.h b/src/lib/include/fwts_cpu.h
> index f5f66108..b023c5e3 100644
> --- a/src/lib/include/fwts_cpu.h
> +++ b/src/lib/include/fwts_cpu.h
> @@ -63,7 +63,7 @@ int fwts_cpu_is_Intel(bool *is_intel);
>   int fwts_cpu_is_AMD(bool *is_amd);
>   int fwts_cpu_is_Hygon(bool *is_hygon);
>   
> -int fwts_cpu_has_c1e(void);
> +fwts_bool fwts_cpu_has_c1e(void);
>   fwts_cpuinfo_x86 *fwts_cpu_get_info(const int which_cpu);
>   void fwts_cpu_free_info(fwts_cpuinfo_x86 *cpu);
>   
> diff --git a/src/lib/include/fwts_memorymap.h b/src/lib/include/fwts_memorymap.h
> index f79113b9..b2a39705 100644
> --- a/src/lib/include/fwts_memorymap.h
> +++ b/src/lib/include/fwts_memorymap.h
> @@ -38,7 +38,7 @@ typedef struct {
>   } fwts_memory_map_entry;
>   
>   int        fwts_memory_map_type(fwts_list *memory_map_list, const uint64_t memory);
> -int        fwts_memory_map_is_reserved(fwts_list *memory_map_list, const uint64_t memory);
> +fwts_bool  fwts_memory_map_is_reserved(fwts_list *memory_map_list, const uint64_t memory);
>   fwts_list *fwts_memory_map_table_load(fwts_framework *fw);
>   void       fwts_memory_map_table_free(fwts_list *memory_map_list);
>   void       fwts_memory_map_table_dump(fwts_framework *fw, fwts_list *memory_map_list);
diff mbox series

Patch

diff --git a/src/lib/include/fwts_cpu.h b/src/lib/include/fwts_cpu.h
index f5f66108..b023c5e3 100644
--- a/src/lib/include/fwts_cpu.h
+++ b/src/lib/include/fwts_cpu.h
@@ -63,7 +63,7 @@  int fwts_cpu_is_Intel(bool *is_intel);
 int fwts_cpu_is_AMD(bool *is_amd);
 int fwts_cpu_is_Hygon(bool *is_hygon);
 
-int fwts_cpu_has_c1e(void);
+fwts_bool fwts_cpu_has_c1e(void);
 fwts_cpuinfo_x86 *fwts_cpu_get_info(const int which_cpu);
 void fwts_cpu_free_info(fwts_cpuinfo_x86 *cpu);
 
diff --git a/src/lib/include/fwts_memorymap.h b/src/lib/include/fwts_memorymap.h
index f79113b9..b2a39705 100644
--- a/src/lib/include/fwts_memorymap.h
+++ b/src/lib/include/fwts_memorymap.h
@@ -38,7 +38,7 @@  typedef struct {
 } fwts_memory_map_entry;
 
 int        fwts_memory_map_type(fwts_list *memory_map_list, const uint64_t memory);
-int        fwts_memory_map_is_reserved(fwts_list *memory_map_list, const uint64_t memory);
+fwts_bool  fwts_memory_map_is_reserved(fwts_list *memory_map_list, const uint64_t memory);
 fwts_list *fwts_memory_map_table_load(fwts_framework *fw);
 void       fwts_memory_map_table_free(fwts_list *memory_map_list);
 void       fwts_memory_map_table_dump(fwts_framework *fw, fwts_list *memory_map_list);