Merge pull request #3192 from MirServer/use-calloc-better

Fix rawhide FTBFS
canonical · Jan 19, 2024 · a5bf64a · a5bf64a
2 parents 435dffd + fac5750
commit a5bf64a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/examples/client/wayland_client.c b/examples/client/wayland_client.c
@@ -570,7 +570,7 @@ int main(int argc, char** argv)
     struct wl_pointer* pointer = wl_seat_get_pointer(globals.seat);
     wl_pointer_add_listener(pointer, &pointer_listener, NULL);
 
-    draw_context* ctx = calloc(sizeof *ctx, 1);
+    draw_context* ctx = calloc(1, sizeof *ctx);
     ctx->display = display;
     ctx->surface = wl_compositor_create_surface(globals.compositor);
     ctx->width = 400;

diff --git a/src/platform/graphics/egl_buffer_copy.cpp b/src/platform/graphics/egl_buffer_copy.cpp
@@ -66,13 +66,13 @@ class GLBulkHandle
 public:
     GLBulkHandle()
     {
-        (**allocator)(1, &id);
+        allocator(1, &id);
     }
 
     ~GLBulkHandle()
     {
         if (id)
-            (**deleter)(1, &id);
+            deleter(1, &id);
     }
 
     GLBulkHandle(GLBulkHandle const&) = delete;
@@ -102,14 +102,14 @@ class GLTypedHandle
 {
 public:
     GLTypedHandle(GLenum type)
-        : id{(**allocator)(type)}
+        : id{allocator(type)}
     {
     }
 
     ~GLTypedHandle()
     {
         if (id)
-            (**deleter)(id);
+            deleter(id);
     }
 
     GLTypedHandle(GLTypedHandle const&) = delete;
@@ -139,14 +139,14 @@ class GLHandle
 {
 public:
     GLHandle()
-        : id{(**allocator)()}
+        : id{allocator()}
     {
     }
 
     ~GLHandle()
     {
         if (id)
-            (**deleter)(id);
+            deleter(id);
     }
 
     GLHandle(GLHandle const&) = delete;

diff --git a/src/server/frontend_xwayland/xcb_connection.cpp b/src/server/frontend_xwayland/xcb_connection.cpp
@@ -207,7 +207,7 @@ void mf::XCBConnection::verify_not_in_error_state() const
 
 auto mf::XCBConnection::query_name(xcb_atom_t atom) const -> std::string
 {
-    std::lock_guard{atom_name_cache_mutex};
+    std::lock_guard lock{atom_name_cache_mutex};
     auto const iter = atom_name_cache.find(atom);
 
     if (iter == atom_name_cache.end())