From df262c7d3049477a23cde85bdabdcdea7f7eebb0 Mon Sep 17 00:00:00 2001 From: Marcus Fritzsch Date: Mon, 26 Jun 2017 21:54:01 +0200 Subject: [PATCH] clang-tidy the place up Signed-off-by: Marcus Fritzsch --- src/main.cpp | 28 +++++++----- src/wayland.cpp | 131 +++++++++++++++++++++++++++++--------------------------- src/wayland.hpp | 12 +++--- 3 files changed, 91 insertions(+), 80 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 60a243a..c85f053 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,7 +3,7 @@ #include -#include +#include #include @@ -28,19 +28,21 @@ int check_events(struct wl::display &d, struct conn &c, int fd) { if (poll(pfd, fd != -1 ? 2 : 1, -1) != -1 && errno != EINTR) { int ret = 0; - if (pfd[0].revents & POLLIN) { + if ((pfd[0].revents & POLLIN) != 0) { ret = d.dispatch(); } - if (ret == -1) + if (ret == -1) { return ret; + } - if (fd != -1 && (pfd[1].revents & POLLIN)) { + if (fd != -1 && ((pfd[1].revents & POLLIN) != 0)) { char buf[256]; // read all there is ... - while (read(pfd[1].fd, buf, sizeof(buf)) == sizeof(buf)) + while (read(pfd[1].fd, buf, sizeof(buf)) == sizeof(buf)) { ; + } // Display current status if (!c.c->surfaces.empty()) { @@ -109,7 +111,7 @@ void init_layout(struct conn &c) { c.c->commit_changes(); // Note: this does not flush the display! } -} +} // namespace // _ ____ // _ __ ___ __ _(_)_ __ / /\ \ @@ -117,15 +119,17 @@ void init_layout(struct conn &c) { // | | | | | | (_| | | | | | | | | // |_| |_| |_|\__,_|_|_| |_| | | | // \_\/_/ -int main(int argc, char **argv) { +int main(int /*argc*/, char ** /*argv*/) { lognotice("WinMan ver. %s", WINMAN_VERSION_STRING); - if (!getenv("XDG_RUNTIME_DIR")) + if (getenv("XDG_RUNTIME_DIR") == nullptr) { fatal("Environment variable XDG_RUNTIME_DIR not set"); + } struct wl::display d {}; - if (!d.ok()) + if (!d.ok()) { fatal("Could not connect to compositor"); + } struct conn c {}; @@ -146,11 +150,13 @@ int main(int argc, char **argv) { // Third level objects d.roundtrip(); - if (!c.c) + if (!c.c) { fatal("ivi_controller global not available"); + } - if (c.outputs.empty()) + if (c.outputs.empty()) { fatal("no output was set up!"); + } init_layout(c); diff --git a/src/wayland.cpp b/src/wayland.cpp index 16e2361..ab8fa76 100644 --- a/src/wayland.cpp +++ b/src/wayland.cpp @@ -1,3 +1,5 @@ +#include + #include "wayland.hpp" // _ @@ -16,7 +18,7 @@ namespace wl { // |_| |___/ display::display() : d(std::unique_ptr( - wl_display_connect(NULL), + wl_display_connect(nullptr), #ifdef DEBUG_OUTPUT [](struct wl_display *d) { logdebug("wl::display ~display @ %p", d); @@ -28,7 +30,7 @@ display::display() r(d.get()) { } -display::~display() {} +display::~display() = default; bool display::ok() const { return d && wl_display_get_error(d.get()) == 0; } @@ -47,42 +49,45 @@ int display::get_fd() const { return wl_display_get_fd(this->d.get()); } // |_| \___|\__, |_|___/\__|_| \__, | // |___/ |___/ namespace { -void registry_global(void *data, struct wl_registry *r, uint32_t name, +void registry_global(void *data, struct wl_registry * /*r*/, uint32_t name, char const *iface, uint32_t v) { static_cast(data)->global(name, iface, v); } -void registry_global_remove(void *data, struct wl_registry *r, uint32_t name) { +void registry_global_remove(void *data, struct wl_registry * /*r*/, + uint32_t name) { static_cast(data)->global_remove(name); } constexpr struct wl_registry_listener registry_listener = { registry_global, registry_global_remove}; -} +} // namespace registry::registry(struct wl_display *d) - : wayland_proxy(!d ? nullptr : wl_display_get_registry(d)) { - if (this->proxy) + : wayland_proxy(d == nullptr ? nullptr : wl_display_get_registry(d)) { + if (this->proxy != nullptr) { wl_registry_add_listener(this->proxy, ®istry_listener, this); } +} registry::~registry() { logdebug("wl::registry %s @ %p", __func__, this->proxy); } void registry::add_global_handler(char const *iface, binder bind) { - this->bindings[iface] = bind; + this->bindings[iface] = std::move(bind); } void registry::global(uint32_t name, char const *iface, uint32_t v) { auto b = this->bindings.find(iface); - if (b != this->bindings.end()) + if (b != this->bindings.end()) { b->second(this->proxy, name, v); + } logdebug("wl::registry @ %p global n %u i %s v %u", this->proxy, name, iface, v); } -void registry::global_remove(uint32_t name) {} +void registry::global_remove(uint32_t /*name*/) {} // _ _ // ___ _ _| |_ _ __ _ _| |_ @@ -91,7 +96,7 @@ void registry::global_remove(uint32_t name) {} // \___/ \__,_|\__| .__/ \__,_|\__| // |_| namespace { -void output_geometry(void *data, struct wl_output *wl_output, int32_t x, +void output_geometry(void *data, struct wl_output * /*wl_output*/, int32_t x, int32_t y, int32_t physical_width, int32_t physical_height, int32_t subpixel, const char *make, const char *model, int32_t transform) { @@ -99,22 +104,23 @@ void output_geometry(void *data, struct wl_output *wl_output, int32_t x, x, y, physical_width, physical_height, subpixel, make, model, transform); } -void output_mode(void *data, struct wl_output *wl_output, uint32_t flags, +void output_mode(void *data, struct wl_output * /*wl_output*/, uint32_t flags, int32_t width, int32_t height, int32_t refresh) { static_cast(data)->mode(flags, width, height, refresh); } -void output_done(void *data, struct wl_output *wl_output) { +void output_done(void *data, struct wl_output * /*wl_output*/) { static_cast(data)->done(); } -void output_scale(void *data, struct wl_output *wl_output, int32_t factor) { +void output_scale(void *data, struct wl_output * /*wl_output*/, + int32_t factor) { static_cast(data)->scale(factor); } constexpr struct wl_output_listener output_listener = { output_geometry, output_mode, output_done, output_scale}; -} +} // namespace output::output(struct wl_registry *r, uint32_t name, uint32_t v) : wayland_proxy(wl_registry_bind(r, name, &wl_output_interface, v)) { @@ -132,7 +138,7 @@ void output::geometry(int32_t x, int32_t y, int32_t pw, int32_t ph, void output::mode(uint32_t flags, int32_t w, int32_t h, int32_t r) { logdebug("wl::output %s @ %p f %x w %i h %i r %i", __func__, this->proxy, flags, w, h, r); - if (flags & WL_OUTPUT_MODE_CURRENT) { + if ((flags & WL_OUTPUT_MODE_CURRENT) != 0u) { this->width = w; this->height = h; this->refresh = r; @@ -146,7 +152,7 @@ void output::done() { void output::scale(int32_t factor) { logdebug("wl::output %s @ %p f %i", __func__, this->proxy, factor); } -} +} // namespace wl // _ __ __ _ _ __ ___ ___ ___ _ __ __ _ ___ ___ // | '_ \ / _` | '_ ` _ \ / _ \/ __| '_ \ / _` |/ __/ _ \ @@ -168,23 +174,23 @@ namespace genivi { // \___\___/|_| |_|\__|_| \___/|_|_|\___|_| // namespace { -void controller_screen(void *data, struct ivi_controller *ivi_controller, +void controller_screen(void *data, struct ivi_controller * /*ivi_controller*/, uint32_t id_screen, struct ivi_controller_screen *screen) { static_cast(data)->controller_screen(id_screen, screen); } -void controller_layer(void *data, struct ivi_controller *ivi_controller, +void controller_layer(void *data, struct ivi_controller * /*ivi_controller*/, uint32_t id_layer) { static_cast(data)->controller_layer(id_layer); } -void controller_surface(void *data, struct ivi_controller *ivi_controller, +void controller_surface(void *data, struct ivi_controller * /*ivi_controller*/, uint32_t id_surface) { static_cast(data)->controller_surface(id_surface); } -void controller_error(void *data, struct ivi_controller *ivi_controller, +void controller_error(void *data, struct ivi_controller * /*ivi_controller*/, int32_t object_id, int32_t object_type, int32_t error_code, const char *error_text) { static_cast(data)->controller_error( @@ -193,7 +199,7 @@ void controller_error(void *data, struct ivi_controller *ivi_controller, constexpr struct ivi_controller_listener listener = { controller_screen, controller_layer, controller_surface, controller_error}; -} +} // namespace controller::controller(struct wl_registry *r, uint32_t name, uint32_t version) : wayland_proxy( @@ -209,8 +215,7 @@ controller::controller(struct wl_registry *r, uint32_t name, uint32_t version) ivi_controller_add_listener(this->proxy, &listener, this); } -controller::~controller() { -} +controller::~controller() = default; void controller::layer_create(uint32_t id, int32_t w, int32_t h) { this->layers[id] = std::make_unique(id, w, h, this); @@ -261,57 +266,57 @@ void controller::controller_error(int32_t object_id, int32_t object_type, // |___/ namespace { void layer_visibility(void *data, - struct ivi_controller_layer *ivi_controller_layer, + struct ivi_controller_layer * /*ivi_controller_layer*/, int32_t visibility) { static_cast(data)->parent->layer_visibility( static_cast(data)->id, visibility); } void layer_opacity(void *data, - struct ivi_controller_layer *ivi_controller_layer, + struct ivi_controller_layer * /*ivi_controller_layer*/, wl_fixed_t opacity) { static_cast(data)->parent->layer_opacity( static_cast(data)->id, float(wl_fixed_to_double(opacity))); } -void layer_source_rectangle(void *data, - struct ivi_controller_layer *ivi_controller_layer, - int32_t x, int32_t y, int32_t width, - int32_t height) { +void layer_source_rectangle( + void *data, struct ivi_controller_layer * /*ivi_controller_layer*/, + int32_t x, int32_t y, int32_t width, int32_t height) { static_cast(data)->parent->layer_source_rectangle( static_cast(data)->id, x, y, width, height); } void layer_destination_rectangle( - void *data, struct ivi_controller_layer *ivi_controller_layer, int32_t x, - int32_t y, int32_t width, int32_t height) { + void *data, struct ivi_controller_layer * /*ivi_controller_layer*/, + int32_t x, int32_t y, int32_t width, int32_t height) { static_cast(data)->parent->layer_destination_rectangle( static_cast(data)->id, x, y, width, height); } void layer_configuration(void *data, - struct ivi_controller_layer *ivi_controller_layer, + struct ivi_controller_layer * /*ivi_controller_layer*/, int32_t width, int32_t height) { static_cast(data)->parent->layer_configuration( static_cast(data)->id, width, height); } void layer_orientation(void *data, - struct ivi_controller_layer *ivi_controller_layer, + struct ivi_controller_layer * /*ivi_controller_layer*/, int32_t orientation) { static_cast(data)->parent->layer_orientation( static_cast(data)->id, orientation); } -void layer_screen(void *data, struct ivi_controller_layer *ivi_controller_layer, +void layer_screen(void *data, + struct ivi_controller_layer * /*ivi_controller_layer*/, struct wl_output *screen) { static_cast(data)->parent->layer_screen( static_cast(data)->id, screen); } void layer_destroyed(void *data, - struct ivi_controller_layer *ivi_controller_layer) { + struct ivi_controller_layer * /*ivi_controller_layer*/) { static_cast(data)->parent->layer_destroyed( static_cast(data)->id); } @@ -322,7 +327,7 @@ constexpr struct ivi_controller_layer_listener layer_listener = { layer_configuration, layer_orientation, layer_screen, layer_destroyed, }; -} +} // namespace layer::layer(uint32_t i, struct controller *c) : layer(i, 0, 0, c) {} @@ -382,7 +387,7 @@ void controller::layer_orientation(uint32_t id, int32_t orientation) { this->layers[id]->orientation = orientation; } -void controller::layer_screen(uint32_t id, struct wl_output *screen) { +void controller::layer_screen(uint32_t /*id*/, struct wl_output *screen) { logdebug("genivi::layer %s @ %p s %p", __func__, this->proxy, screen); } @@ -400,15 +405,15 @@ void controller::layer_destroyed(uint32_t id) { // namespace { -void surface_visibility(void *data, - struct ivi_controller_surface *ivi_controller_surface, - int32_t visibility) { +void surface_visibility( + void *data, struct ivi_controller_surface * /*ivi_controller_surface*/, + int32_t visibility) { static_cast(data)->parent->surface_visibility( static_cast(data)->id, visibility); } void surface_opacity(void *data, - struct ivi_controller_surface *ivi_controller_surface, + struct ivi_controller_surface * /*ivi_controller_surface*/, wl_fixed_t opacity) { static_cast(data)->parent->surface_opacity( static_cast(data)->id, @@ -416,49 +421,49 @@ void surface_opacity(void *data, } void surface_source_rectangle( - void *data, struct ivi_controller_surface *ivi_controller_surface, int32_t x, - int32_t y, int32_t width, int32_t height) { + void *data, struct ivi_controller_surface * /*ivi_controller_surface*/, + int32_t x, int32_t y, int32_t width, int32_t height) { static_cast(data)->parent->surface_source_rectangle( static_cast(data)->id, x, y, width, height); } void surface_destination_rectangle( - void *data, struct ivi_controller_surface *ivi_controller_surface, int32_t x, - int32_t y, int32_t width, int32_t height) { + void *data, struct ivi_controller_surface * /*ivi_controller_surface*/, + int32_t x, int32_t y, int32_t width, int32_t height) { static_cast(data)->parent->surface_destination_rectangle( static_cast(data)->id, x, y, width, height); } void surface_configuration( - void *data, struct ivi_controller_surface *ivi_controller_surface, + void *data, struct ivi_controller_surface * /*ivi_controller_surface*/, int32_t width, int32_t height) { static_cast(data)->parent->surface_configuration( static_cast(data)->id, width, height); } -void surface_orientation(void *data, - struct ivi_controller_surface *ivi_controller_surface, - int32_t orientation) { +void surface_orientation( + void *data, struct ivi_controller_surface * /*ivi_controller_surface*/, + int32_t orientation) { static_cast(data)->parent->surface_orientation( static_cast(data)->id, orientation); } -void surface_pixelformat(void *data, - struct ivi_controller_surface *ivi_controller_surface, - int32_t pixelformat) { +void surface_pixelformat( + void *data, struct ivi_controller_surface * /*ivi_controller_surface*/, + int32_t pixelformat) { static_cast(data)->parent->surface_pixelformat( static_cast(data)->id, pixelformat); } void surface_layer(void *data, - struct ivi_controller_surface *ivi_controller_surface, + struct ivi_controller_surface * /*ivi_controller_surface*/, struct ivi_controller_layer *layer) { static_cast(data)->parent->surface_layer( static_cast(data)->id, layer); } void surface_stats(void *data, - struct ivi_controller_surface *ivi_controller_surface, + struct ivi_controller_surface * /*ivi_controller_surface*/, uint32_t redraw_count, uint32_t frame_count, uint32_t update_count, uint32_t pid, const char *process_name) { @@ -467,14 +472,14 @@ void surface_stats(void *data, update_count, pid, process_name); } -void surface_destroyed(void *data, - struct ivi_controller_surface *ivi_controller_surface) { +void surface_destroyed( + void *data, struct ivi_controller_surface * /*ivi_controller_surface*/) { static_cast(data)->parent->surface_destroyed( static_cast(data)->id); } void surface_content(void *data, - struct ivi_controller_surface *ivi_controller_surface, + struct ivi_controller_surface * /*ivi_controller_surface*/, int32_t content_state) { static_cast(data)->parent->surface_content( static_cast(data)->id, content_state); @@ -493,7 +498,7 @@ constexpr struct ivi_controller_surface_listener surface_listener = { surface_destroyed, surface_content, }; -} +} // namespace surface::surface(uint32_t i, struct controller *c) : wayland_proxy(ivi_controller_surface_create(c->proxy, i)), @@ -552,17 +557,17 @@ void controller::surface_orientation(uint32_t id, int32_t orientation) { this->surfaces[id]->orientation = orientation; } -void controller::surface_pixelformat(uint32_t id, int32_t pixelformat) { +void controller::surface_pixelformat(uint32_t /*id*/, int32_t pixelformat) { logdebug("genivi::surface %s @ %p f %i", __func__, this->proxy, pixelformat); } -void controller::surface_layer(uint32_t id, +void controller::surface_layer(uint32_t /*id*/, struct ivi_controller_layer *layer) { logdebug("genivi::surface %s @ %p l %u @ %p", __func__, this->proxy, this->layer_proxy_to_id[uintptr_t(layer)], layer); } -void controller::surface_stats(uint32_t id, uint32_t redraw_count, +void controller::surface_stats(uint32_t /*id*/, uint32_t redraw_count, uint32_t frame_count, uint32_t update_count, uint32_t pid, const char *process_name) { logdebug("genivi::surface %s @ %p r %u f %u u %u pid %u p %s", __func__, @@ -595,4 +600,4 @@ screen::screen(uint32_t i, struct controller *c, : wayland_proxy(p), controller_child(c, i) { logdebug("genivi::screen @ %p id %u", p, i); } -} +} // namespace genivi diff --git a/src/wayland.hpp b/src/wayland.hpp index c1c21a0..f7f9ce5 100644 --- a/src/wayland.hpp +++ b/src/wayland.hpp @@ -85,11 +85,11 @@ struct display { // \___/ \__,_|\__| .__/ \__,_|\__| // |_| struct output : wayland_proxy { - int width; - int height; - int refresh; + int width{}; + int height{}; + int refresh{}; - output(struct wl_registry *registry, uint32_t name, uint32_t version); + output(struct wl_registry *r, uint32_t name, uint32_t v); // Events void geometry(int32_t x, int32_t y, int32_t pw, int32_t ph, int32_t subpel, @@ -368,8 +368,8 @@ struct controller : public wayland_proxy { void controller_screen(uint32_t id, struct ivi_controller_screen *screen); void controller_layer(uint32_t id); void controller_surface(uint32_t id); - void controller_error(int32_t oid, int32_t otype, int32_t code, - char const *text); + void controller_error(int32_t object_id, int32_t object_type, + int32_t error_code, char const *error_text); // surface void surface_visibility(uint32_t id, int32_t visibility); -- 2.16.6