enable -pedantic

Author: ardera

CMakeLists.txt

@@ -162,13 +162,13 @@ target_link_libraries(flutterpi_module PUBLIC
 )
 
 target_include_directories(flutterpi_module PUBLIC
-  ${CMAKE_SOURCE_DIR}/third_party/flutter_embedder_header/include
   ${CMAKE_SOURCE_DIR}/src
   ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/third_party/flutter_embedder_header/include
 )
 
 target_compile_options(flutterpi_module PUBLIC
-  $<$<CONFIG:Debug>:-O0 -Wall -Wextra -Wno-sign-compare -Wswitch-enum -Wformat -Wformat-pedantic -Wdouble-promotion -Werror -ggdb -U_FORTIFY_SOURCE -DDEBUG>
+  $<$<CONFIG:Debug>:-O0 -Wall -Wextra -Wno-sign-compare -Wswitch-enum -Wformat -Wdouble-promotion -Wno-overlength-strings -Wno-gnu-zero-variadic-macro-arguments -pedantic -Werror -ggdb -U_FORTIFY_SOURCE -DDEBUG>
   $<$<CONFIG:RelWithDebInfo>:-O3 -Wall -Wextra -Wno-sign-compare -ggdb -DNDEBUG>
   $<$<CONFIG:Release>:-O3 -Wall -Wextra -Wno-sign-compare -DNDEBUG>
 )

src/dmabuf_surface.c

@@ -68,7 +68,7 @@ void refcounted_dmabuf_destroy(struct refcounted_dmabuf *dmabuf) {
     free(dmabuf);
 }
 
-DEFINE_STATIC_REF_OPS(refcounted_dmabuf, n_refs);
+DEFINE_STATIC_REF_OPS(refcounted_dmabuf, n_refs)
 
 struct dmabuf_surface {
     struct surface surface;

src/egl.h

@@ -475,7 +475,8 @@ static inline const char *egl_strerror(EGLenum result) {
     }
 }
 
-    #define LOG_EGL_ERROR(result, fmt, ...) LOG_ERROR(fmt ": %s\n", __VA_ARGS__ egl_strerror(result))
+    #define LOG_EGL_ERROR_FMT(result, fmt, ...) LOG_ERROR(fmt ": %s\n", __VA_ARGS__ egl_strerror(result))
+    #define LOG_EGL_ERROR(result, fmt) LOG_ERROR(fmt ": %s\n", egl_strerror(result))
 #endif
 
 #endif  // _FLUTTERPI_SRC_EGL_H

src/flutter-pi.c

@@ -394,7 +394,7 @@ static void *proc_resolver(void *userdata, const char *name) {
     flutterpi = userdata;
     ASSERT_NOT_NULL(flutterpi->gl_renderer);
 
-    return gl_renderer_get_proc_address(flutterpi->gl_renderer, name);
+    return (void *) gl_renderer_get_proc_address(flutterpi->gl_renderer, name);
 }
 #endif
 
@@ -1039,7 +1039,7 @@ struct gl_renderer *flutterpi_get_gl_renderer(struct flutterpi *flutterpi) {
 }
 
 void flutterpi_set_pointer_kind(struct flutterpi *flutterpi, enum pointer_kind kind) {
-    return compositor_set_cursor(flutterpi->compositor, false, false, true, kind, false, VEC2F(0, 0));
+    compositor_set_cursor(flutterpi->compositor, false, false, true, kind, false, VEC2F(0, 0));
 }
 
 void flutterpi_trace_event_instant(struct flutterpi *flutterpi, const char *name) {
@@ -1165,14 +1165,13 @@ static void unload_flutter_engine_lib(void *handle) {
     dlclose(handle);
 }
 
-static int get_flutter_engine_procs(void *engine_handle, FlutterEngineProcTable *procs_out) {
-    // clang-format off
-    FlutterEngineResult (*get_proc_addresses)(FlutterEngineProcTable *table);
-    // clang-format on
+typedef FlutterEngineResult (*flutter_engine_get_proc_addresses_t)(FlutterEngineProcTable *table);
 
+static int get_flutter_engine_procs(void *engine_handle, FlutterEngineProcTable *procs_out) {
     FlutterEngineResult engine_result;
 
-    get_proc_addresses = dlsym(engine_handle, "FlutterEngineGetProcAddresses");
+    flutter_engine_get_proc_addresses_t get_proc_addresses = (flutter_engine_get_proc_addresses_t
+    ) dlsym(engine_handle, "FlutterEngineGetProcAddresses");
     if (get_proc_addresses == NULL) {
         LOG_ERROR("Could not resolve flutter engine function FlutterEngineGetProcAddresses.\n");
         return EINVAL;
@@ -2180,7 +2179,7 @@ static struct drmdev *find_drmdev(struct libseat *libseat) {
     return NULL;
 }
 
-static struct gbm_device *open_rendernode_as_gbm_device() {
+static struct gbm_device *open_rendernode_as_gbm_device(void) {
     struct gbm_device *gbm;
     drmDevicePtr devices[64];
     int ok, n_devices;

src/flutter_embedder.h

@@ -0,0 +1,11 @@
+#ifndef _FLUTTERPI_SRC_FLUTTER_EMBEDDER_H
+#define _FLUTTERPI_SRC_FLUTTER_EMBEDDER_H
+
+#include "util/macros.h"
+
+PRAGMA_DIAGNOSTIC_PUSH
+PRAGMA_DIAGNOSTIC_IGNORED("-Wstrict-prototypes")
+#include "flutter_embedder_header/flutter_embedder.h"
+PRAGMA_DIAGNOSTIC_POP
+
+#endif  // _FLUTTERPI_SRC_FLUTTER_EMBEDDER_H

src/gl_renderer.c

@@ -62,24 +62,24 @@ struct gl_renderer {
 #endif
 };
 
-static void *try_get_proc_address(const char *name) {
-    void *address;
+static fn_ptr_t try_get_proc_address(const char *name) {
+    fn_ptr_t address;
 
     address = eglGetProcAddress(name);
     if (address) {
         return address;
     }
 
-    address = dlsym(RTLD_DEFAULT, name);
+    address = (fn_ptr_t) dlsym(RTLD_DEFAULT, name);
     if (address) {
         return address;
     }
 
-    return NULL;
+    return (fn_ptr_t) NULL;
 }
 
-static void *get_proc_address(const char *name) {
-    void *address;
+static fn_ptr_t get_proc_address(const char *name) {
+    fn_ptr_t address;
 
     address = try_get_proc_address(name);
     if (address == NULL) {
@@ -183,7 +183,7 @@ struct gl_renderer *gl_renderer_new_from_gbm_device(
 
     if (supports_egl_ext_platform_base) {
 #ifdef EGL_EXT_platform_base
-        egl_get_platform_display_ext = try_get_proc_address("eglGetPlatformDisplayEXT");
+        egl_get_platform_display_ext = (PFNEGLGETPLATFORMDISPLAYEXTPROC) try_get_proc_address("eglGetPlatformDisplayEXT");
         if (egl_get_platform_display_ext == NULL) {
             LOG_ERROR("Couldn't resolve \"eglGetPlatformDisplayEXT\" even though \"EGL_EXT_platform_base\" was listed as supported.\n");
             supports_egl_ext_platform_base = false;
@@ -195,7 +195,8 @@ struct gl_renderer *gl_renderer_new_from_gbm_device(
 
     if (supports_egl_ext_platform_base) {
 #ifdef EGL_EXT_platform_base
-        egl_create_platform_window_surface_ext = try_get_proc_address("eglCreatePlatformWindowSurfaceEXT");
+        egl_create_platform_window_surface_ext = (PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC
+        ) try_get_proc_address("eglCreatePlatformWindowSurfaceEXT");
         if (egl_create_platform_window_surface_ext == NULL) {
             LOG_ERROR(
                 "Couldn't resolve \"eglCreatePlatformWindowSurfaceEXT\" even though \"EGL_EXT_platform_base\" was listed as supported.\n"
@@ -217,8 +218,9 @@ struct gl_renderer *gl_renderer_new_from_gbm_device(
     bool failed_before = false;
 
 #ifdef EGL_VERSION_1_5
-    PFNEGLGETPLATFORMDISPLAYPROC egl_get_platform_display = try_get_proc_address("eglGetPlatformDisplay");
-    PFNEGLCREATEPLATFORMWINDOWSURFACEPROC egl_create_platform_window_surface = try_get_proc_address("eglCreatePlatformWindowSurface");
+    PFNEGLGETPLATFORMDISPLAYPROC egl_get_platform_display = (PFNEGLGETPLATFORMDISPLAYPROC) try_get_proc_address("eglGetPlatformDisplay");
+    PFNEGLCREATEPLATFORMWINDOWSURFACEPROC egl_create_platform_window_surface = (PFNEGLCREATEPLATFORMWINDOWSURFACEPROC
+    ) try_get_proc_address("eglCreatePlatformWindowSurface");
 
     if (egl_display == EGL_NO_DISPLAY && egl_get_platform_display != NULL) {
         egl_display = egl_get_platform_display(EGL_PLATFORM_GBM_KHR, gbm_device, NULL);
@@ -550,7 +552,7 @@ int gl_renderer_clear_current(struct gl_renderer *renderer) {
     return 0;
 }
 
-void *gl_renderer_get_proc_address(ASSERTED struct gl_renderer *renderer, const char *name) {
+fn_ptr_t gl_renderer_get_proc_address(ASSERTED struct gl_renderer *renderer, const char *name) {
     ASSERT_NOT_NULL(renderer);
     ASSERT_NOT_NULL(name);
     return get_proc_address(name);
@@ -628,7 +630,7 @@ int gl_renderer_make_this_a_render_thread(struct gl_renderer *renderer) {
     return 0;
 }
 
-void gl_renderer_cleanup_this_render_thread() {
+void gl_renderer_cleanup_this_render_thread(void) {
     EGLDisplay display;
     EGLContext context;
     EGLBoolean egl_ok;

src/gl_renderer.h

@@ -26,6 +26,8 @@
 
 #include "egl.h"
 
+typedef void (*fn_ptr_t)(void);
+
 struct tracer;
 
 struct gl_renderer *gl_renderer_new_from_gbm_device(
@@ -59,7 +61,7 @@ int gl_renderer_clear_current(struct gl_renderer *renderer);
 
 EGLContext gl_renderer_create_context(struct gl_renderer *renderer);
 
-void *gl_renderer_get_proc_address(struct gl_renderer *renderer, const char *name);
+fn_ptr_t gl_renderer_get_proc_address(struct gl_renderer *renderer, const char *name);
 
 EGLDisplay gl_renderer_get_egl_display(struct gl_renderer *renderer);
 
@@ -71,7 +73,7 @@ bool gl_renderer_is_llvmpipe(struct gl_renderer *renderer);
 
 int gl_renderer_make_this_a_render_thread(struct gl_renderer *renderer);
 
-void gl_renderer_cleanup_this_render_thread();
+void gl_renderer_cleanup_this_render_thread(void);
 
 ATTR_PURE EGLConfig gl_renderer_choose_config(struct gl_renderer *renderer, bool has_desired_pixel_format, enum pixfmt desired_pixel_format);
 

src/locales.c

@@ -220,7 +220,7 @@ static int add_locale_variants(struct list_head *locales, const char *locale_des
     }
 
     // then append all possible combinations
-    for (int i = 0b111; i >= 0; i--) {
+    for (int i = 7; i >= 0; i--) {
         char *territory_2 = NULL, *codeset_2 = NULL, *modifier_2 = NULL;
 
         if ((i & 1) != 0) {
@@ -311,7 +311,7 @@ struct locales *locales_new(void) {
 
     // Use those to create our flutter locales.
     n_locales = list_length(&locales->locales);
-    fl_locales = calloc(n_locales ?: 1, sizeof(const FlutterLocale *));
+    fl_locales = calloc(n_locales == 0 ? 1 : n_locales, sizeof(const FlutterLocale *));
     if (fl_locales == NULL) {
         goto fail_free_allocated_locales;
     }

src/modesetting.c

@@ -934,7 +934,7 @@ static void free_planes(struct drm_plane *planes, size_t n_planes) {
     free(planes);
 }
 
-static void assert_rotations_work() {
+static void assert_rotations_work(void) {
     assert(PLANE_TRANSFORM_ROTATE_0.rotate_0 == true);
     assert(PLANE_TRANSFORM_ROTATE_0.rotate_90 == false);
     assert(PLANE_TRANSFORM_ROTATE_0.rotate_180 == false);
@@ -2631,15 +2631,15 @@ UNUSED struct kms_req *kms_req_ref(struct kms_req *req) {
 }
 
 UNUSED void kms_req_unref(struct kms_req *req) {
-    return kms_req_builder_unref((struct kms_req_builder *) req);
+    kms_req_builder_unref((struct kms_req_builder *) req);
 }
 
 UNUSED void kms_req_unrefp(struct kms_req **req) {
-    return kms_req_builder_unrefp((struct kms_req_builder **) req);
+    kms_req_builder_unrefp((struct kms_req_builder **) req);
 }
 
 UNUSED void kms_req_swap_ptrs(struct kms_req **oldp, struct kms_req *new) {
-    return kms_req_builder_swap_ptrs((struct kms_req_builder **) oldp, (struct kms_req_builder *) new);
+    kms_req_builder_swap_ptrs((struct kms_req_builder **) oldp, (struct kms_req_builder *) new);
 }
 
 static bool drm_plane_is_active(struct drm_plane *plane) {
@@ -2952,14 +2952,14 @@ kms_req_commit_common(struct kms_req *req, bool blocking, kms_scanout_cb_t scano
     goto fail_unlock;
 
 fail_unref_builder: {
-        struct drmdev *drmdev = builder->drmdev;
-        kms_req_builder_unref(builder);
-        if (mode_blob != NULL) {
-            drm_mode_blob_destroy(mode_blob);
-        }
-        drmdev_unlock(drmdev);
-        return ok;
+    struct drmdev *drmdev = builder->drmdev;
+    kms_req_builder_unref(builder);
+    if (mode_blob != NULL) {
+        drm_mode_blob_destroy(mode_blob);
     }
+    drmdev_unlock(drmdev);
+    return ok;
+}
 
 fail_maybe_destroy_mode_blob:
     if (mode_blob != NULL)

src/modesetting.h

@@ -746,7 +746,7 @@ struct kms_req_builder;
 
 struct kms_req_builder *drmdev_create_request_builder(struct drmdev *drmdev, uint32_t crtc_id);
 
-DECLARE_REF_OPS(kms_req_builder);
+DECLARE_REF_OPS(kms_req_builder)
 
 /**
  * @brief Gets the @ref drmdev associated with this KMS request builder.
@@ -895,7 +895,7 @@ int kms_req_builder_push_zpos_placeholder_layer(struct kms_req_builder *builder,
  */
 struct kms_req;
 
-DECLARE_REF_OPS(kms_req);
+DECLARE_REF_OPS(kms_req)
 
 /**
  * @brief Build the KMS request builder into an actual, immutable KMS request