clang pedantic warning fixes

Author: ardera

CMakePresets.json

@@ -33,6 +33,24 @@
                 "ENABLE_ASAN": true
             }
         },
+        {
+            "name": "default-debug-clang",
+            "displayName": "Default OpenGL host build (Debug, Clang)",
+            "inherits": "default-debug",
+            "cacheVariables": {
+                "CMAKE_C_COMPILER": "clang",
+                "CMAKE_CXX_COMPILER": "clang++"
+            }
+        },
+        {
+            "name": "default-debug-gcc",
+            "displayName": "Default OpenGL host build (Debug, gcc)",
+            "inherits": "default-debug",
+            "cacheVariables": {
+                "CMAKE_C_COMPILER": "gcc",
+                "CMAKE_CXX_COMPILER": "g++"
+            }
+        },
         {
             "name": "default-relwithdebinfo",
             "displayName": "Default OpenGL host build (Release with Debug Info)",

src/compositor_ng.c

@@ -1794,7 +1794,7 @@ static void on_input(void *userdata, size_t n_events, const struct user_input_ev
             case USER_INPUT_TABLET_TOOL: on_tablet_tool_event(compositor, &buffer, event); break;
             case USER_INPUT_POINTER: on_pointer_event(compositor, &buffer, event); break;
             case USER_INPUT_KEY: UNREACHABLE(); break;
-            default: LOG_DEBUG("Unhandled enum user_input_event: %d\n", event->type); break;
+            default: LOG_DEBUG("Unhandled enum user_input_event: %u\n", event->type); break;
         }
     }
 

src/dummy_window.h

@@ -22,4 +22,4 @@ MUST_CHECK struct window *dummy_window_new(
     // clang-format on
 );
 
-#endif  // _FLUTTERPI_SRC_DUMMY_WINDOW_H
+#endif  // _FLUTTERPI_SRC_DUMMY_WINDOW_H

src/flutter-pi.c

@@ -628,7 +628,7 @@ static void on_execute_fl_task(void *userdata) {
 
     result = task->fl_run_task(task->fl_engine, &task->fl_task);
     if (result != kSuccess) {
-        LOG_ERROR("Error running platform task. FlutterEngineRunTask: %d\n", result);
+        LOG_ERROR("Error running platform task. FlutterEngineRunTask: %u\n", result);
     }
 
     free(task);
@@ -2097,7 +2097,7 @@ struct flutterpi *flutterpi_new_from_args(int argc, char **argv) {
     fpi->tracer = tracer_new_with_stubs();
     if (fpi->tracer == NULL) {
         LOG_ERROR("Couldn't create event tracer.\n");
-        goto fail_destroy_drmdev;
+        goto fail_destroy_drm_resources;
     }
 
     if (renderer_type == kVulkan_RendererType) {
@@ -2346,6 +2346,9 @@ struct flutterpi *flutterpi_new_from_args(int argc, char **argv) {
 fail_unref_tracer:
     tracer_unref(fpi->tracer);
 
+fail_destroy_drm_resources:
+    drm_resources_unref(drm_resources);
+
 fail_destroy_drmdev:
     drmdev_unref(fpi->drmdev);
 

src/kms/drmdev.c

@@ -119,7 +119,7 @@ static bool is_kms_device(const char *path, const struct file_interface *interfa
     return true;
 }
 
-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);

src/kms/kms_window.c

@@ -870,12 +870,17 @@ static struct render_surface *kms_window_get_render_surface_internal(struct kms_
         // First, count the allowed modifiers for this pixel format.
         drm_plane_for_each_modified_format(plane_it, count_modifiers_for_pixel_format, &context);
 
-        n_allowed_modifiers = context.n_modifiers;
-        allowed_modifiers = calloc(n_allowed_modifiers, sizeof(*context.modifiers));
-        context.modifiers = allowed_modifiers;
+        if (context.n_modifiers > 0) {
+            n_allowed_modifiers = context.n_modifiers;
+            allowed_modifiers = calloc(n_allowed_modifiers, sizeof(*context.modifiers));
+            context.modifiers = allowed_modifiers;
 
-        // Next, fill context.modifiers with the allowed modifiers.
-        drm_plane_for_each_modified_format(plane_it, extract_modifiers_for_pixel_format, &context);
+            // Next, fill context.modifiers with the allowed modifiers.
+            drm_plane_for_each_modified_format(plane_it, extract_modifiers_for_pixel_format, &context);
+        } else {
+            n_allowed_modifiers = 0;
+            allowed_modifiers = NULL;
+        }
         break;
     }
 

src/kms/kms_window.h

@@ -30,4 +30,4 @@ MUST_CHECK struct window *kms_window_new(
     // clang-format on
 );
 
-#endif  // _FLUTTERPI_SRC_KMS_KMS_WINDOW_H
+#endif  // _FLUTTERPI_SRC_KMS_KMS_WINDOW_H

src/kms/req_builder.c

@@ -274,7 +274,7 @@ struct kms_req_builder *kms_req_builder_new_atomic(struct drmdev *drmdev, struct
 
     builder->crtc = drm_resources_get_crtc(resources, crtc_id);
     if (builder->crtc == NULL) {
-        LOG_ERROR("Invalid CRTC: %" PRId32 "\n", crtc_id);
+        LOG_ERROR("Invalid CRTC: %" PRIu32 "\n", crtc_id);
         goto fail_unref_drmdev;
     }
 
@@ -319,7 +319,7 @@ struct kms_req_builder *kms_req_builder_new_legacy(struct drmdev *drmdev, struct
 
     builder->crtc = drm_resources_get_crtc(resources, crtc_id);
     if (builder->crtc == NULL) {
-        LOG_ERROR("Invalid CRTC: %" PRId32 "\n", crtc_id);
+        LOG_ERROR("Invalid CRTC: %" PRIu32 "\n", crtc_id);
         goto fail_unref_drmdev;
     }
 
@@ -699,13 +699,8 @@ static int kms_req_commit_common(
     void *release_cb_userdata
 ) {
     struct kms_req_builder *builder;
-    struct drm_blob *mode_blob;
-    bool update_mode;
     int ok;
 
-    update_mode = false;
-    mode_blob = NULL;
-
     ASSERT_NOT_NULL(req);
     builder = (struct kms_req_builder *) req;
 
@@ -733,6 +728,8 @@ static int kms_req_commit_common(
         }
     }
 
+    bool update_mode = false;
+    struct drm_blob *mode_blob = NULL;
     if (upload_mode) {
         update_mode = true;
         mode_blob = drm_blob_new_mode(drmdev_get_modesetting_fd(drmdev), &builder->mode, true);
@@ -943,9 +940,8 @@ static int kms_req_commit_common(
 fail_unref_builder:
     kms_req_builder_unref(builder);
 
-    // fail_maybe_destroy_mode_blob:
-    //     if (mode_blob != NULL)
-    //         drm_blob_destroy(mode_blob);
+    if (mode_blob != NULL)
+        drm_blob_destroy(mode_blob);
 
     return ok;
 }

src/kms/resources.h

@@ -810,4 +810,4 @@ static inline float mode_get_vrefresh(const drmModeModeInfo *mode) {
     return mode->clock * 1000.0f / (mode->htotal * mode->vtotal);
 }
 
-#endif
+#endif  // _FLUTTERPI_MODESETTING_RESOURCES_H

src/util/event_loop.c

@@ -5,16 +5,15 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <flutter_embedder.h>
 #include <sys/eventfd.h>
 #include <sys/time.h>
 #include <systemd/sd-event.h>
 
-#include <flutter_embedder.h>
-
-#include "util/lock_ops.h"
 #include "util/collection.h"
-#include "util/refcounting.h"
+#include "util/lock_ops.h"
 #include "util/logging.h"
+#include "util/refcounting.h"
 
 struct evloop {
     refcount_t n_refs;
@@ -43,7 +42,7 @@ static int on_wakeup_event_loop(sd_event_source *s, int fd, uint32_t revents, vo
     return 0;
 }
 
-struct evloop *evloop_new() {
+struct evloop *evloop_new(void) {
     struct evloop *loop;
     sd_event *sdloop;
     int ok, wakeup_fd;
@@ -344,7 +343,6 @@ static int evloop_post_delayed_task_locked(struct evloop *loop, void_callback_t
 
     return 0;
 
-
 fail_free_task:
     free(task);
     return ok;
@@ -478,7 +476,7 @@ static void *evthread_entry(void *userdata) {
 
         evthread->loop = evloop;
         evthread->thread = pthread_self();
-        
+
         args->evthread = evthread;
         args->initialization_success = true;
         sem_post(&args->initialization_done);