summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/main.cpp2
-rw-r--r--src/wayland.cpp9
2 files changed, 6 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 571ffca..ba41a65 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -130,7 +130,7 @@ int main(int /*argc*/, char ** /*argv*/) {
sigaddset(&sset, SIGTERM);
auto sfd = unique_fd(signalfd(-1, &sset, SFD_NONBLOCK | SFD_CLOEXEC));
- sigprocmask(SIG_BLOCK, &sset, NULL);
+ sigprocmask(SIG_BLOCK, &sset, nullptr);
p.add_fd(sfd.fd, [](int fd) {
struct signalfd_siginfo si;
while (read(fd, &si, sizeof(si)) == sizeof(si)) {
diff --git a/src/wayland.cpp b/src/wayland.cpp
index d3b82f0..8b44852 100644
--- a/src/wayland.cpp
+++ b/src/wayland.cpp
@@ -423,7 +423,7 @@ void controller::layer_orientation(struct layer *l, int32_t orientation) {
l->orientation = orientation;
}
-void controller::layer_screen(struct layer *l, struct wl_output *screen) {
+void controller::layer_screen(struct layer * /*l*/, struct wl_output *screen) {
logdebug("genivi::layer %s @ %p s %p", __func__, this->proxy.get(), screen);
}
@@ -635,18 +635,19 @@ void controller::surface_orientation(struct surface *s, int32_t orientation) {
s->orientation = orientation;
}
-void controller::surface_pixelformat(struct surface *s, int32_t pixelformat) {
+void controller::surface_pixelformat(struct surface * /*s*/,
+ int32_t pixelformat) {
logdebug("genivi::surface %s @ %p f %i", __func__, this->proxy.get(),
pixelformat);
}
-void controller::surface_layer(struct surface *s,
+void controller::surface_layer(struct surface * /*s*/,
struct ivi_controller_layer *layer) {
logdebug("genivi::surface %s @ %p l %u @ %p", __func__, this->proxy.get(),
this->layer_proxy_to_id[uintptr_t(layer)], layer);
}
-void controller::surface_stats(struct surface *s, uint32_t redraw_count,
+void controller::surface_stats(struct surface * /*s*/, 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__,