Code Review
/
staging
/
windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
cmake: fix source list layout
[staging/windowmanager.git]
/
src
/
main.cpp
diff --git
a/src/main.cpp
b/src/main.cpp
index
6de8597
..
5eb211c
100644
(file)
--- a/
src/main.cpp
+++ b/
src/main.cpp
@@
-1,7
+1,7
@@
+#include "app.hpp"
#include "json_helper.hpp"
#include "util.hpp"
#include "wayland.hpp"
#include "json_helper.hpp"
#include "util.hpp"
#include "wayland.hpp"
-#include "app.hpp"
#include <algorithm>
#include <json.h>
#include <algorithm>
#include <json.h>
@@
-31,8
+31,8
@@
int afb_instance::init() {
return this->app.init();
}
return this->app.init();
}
-int display_event_callback(sd_event_source *evs, int
fd
, uint32_t events,
- void *
data
) {
+int display_event_callback(sd_event_source *evs, int
/*fd*/
, uint32_t events,
+ void *
/*data*/
) {
if ((events & EPOLLHUP) != 0) {
logerror("The compositor hung up, dying now.");
delete g_afb_instance;
if ((events & EPOLLHUP) != 0) {
logerror("The compositor hung up, dying now.");
delete g_afb_instance;
@@
-40,10
+40,10
@@
int display_event_callback(sd_event_source *evs, int fd, uint32_t events,
goto error;
}
goto error;
}
- if (
events & EPOLLIN
) {
-
if (g_afb_instance->app.dispatch_events() == -1) {
-
goto error;
-
}
+ if (
(events & EPOLLIN) != 0u
) {
+ if (g_afb_instance->app.dispatch_events() == -1) {
+ goto error;
+ }
}
return 0;
}
return 0;
@@
-107,9
+107,9
@@
int binding_init() noexcept {
return -1;
}
return -1;
}
-} // namespace
+}
// namespace
-#include "afb_binding.inl"
+#include "afb_binding
_glue
.inl"
extern "C" const struct afb_binding_v2 afbBindingV2 = {
extern "C" const struct afb_binding_v2 afbBindingV2 = {
- "winman",
NULL, NULL, winman_verbs, NULL, binding_init, NULL
, 1};
+ "winman",
nullptr, nullptr, winman_verbs, nullptr, binding_init, nullptr
, 1};