From f643e112123a95291d3efb7aa3e98379d42ec0ef Mon Sep 17 00:00:00 2001 From: Enrico Fraccaroli Date: Tue, 13 Dec 2022 17:01:26 -0500 Subject: [PATCH] Disable missing-braces warning. --- libc/CMakeLists.txt | 1 + mentos/CMakeLists.txt | 1 + mentos/src/mem/paging.c | 6 +++--- programs/CMakeLists.txt | 1 + programs/tests/CMakeLists.txt | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt index e8702a4..ac759d2 100644 --- a/libc/CMakeLists.txt +++ b/libc/CMakeLists.txt @@ -50,6 +50,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-variable") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unknown-pragmas") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-braces") # Set the compiler options. set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static") diff --git a/mentos/CMakeLists.txt b/mentos/CMakeLists.txt index deb839f..af565fa 100644 --- a/mentos/CMakeLists.txt +++ b/mentos/CMakeLists.txt @@ -67,6 +67,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-variable") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unknown-pragmas") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-braces") # Set the compiler options. set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static") diff --git a/mentos/src/mem/paging.c b/mentos/src/mem/paging.c index 6a08d56..7ededbf 100644 --- a/mentos/src/mem/paging.c +++ b/mentos/src/mem/paging.c @@ -165,12 +165,12 @@ uint32_t clone_vm_area(mm_struct_t *mm, vm_area_struct_t *area, int cow, uint32_ static void __init_pagedir(page_directory_t *pdir) { - *pdir = (page_directory_t){ 0 }; + *pdir = (page_directory_t){ {0} }; } static void __init_pagetable(page_table_t *ptable) { - *ptable = (page_table_t){ 0 }; + *ptable = (page_table_t){ {0} }; } void paging_init(boot_info_t *info) @@ -328,7 +328,7 @@ void page_fault_handler(pt_regs *f) // value in the cr2 control register. uint32_t faulting_addr; __asm__ __volatile__("mov %%cr2, %0" - : "=r"(faulting_addr)); + : "=r"(faulting_addr)); // Get the physical address of the current page directory. uint32_t phy_dir = (uint32_t)paging_get_current_directory(); // Get the page directory. diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt index 4725591..5e36d4c 100644 --- a/programs/CMakeLists.txt +++ b/programs/CMakeLists.txt @@ -25,6 +25,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-variable") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unknown-pragmas") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-braces") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-command-line-argument") # Set the compiler options. diff --git a/programs/tests/CMakeLists.txt b/programs/tests/CMakeLists.txt index 60811ca..22d2855 100644 --- a/programs/tests/CMakeLists.txt +++ b/programs/tests/CMakeLists.txt @@ -25,6 +25,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-variable") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unknown-pragmas") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-braces") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-command-line-argument") # Set the compiler options.