aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-10-15 00:23:53 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-10-15 00:26:27 +1000
commitc6f153d8f9ad6c961c8dd8e620dc2e8fcb20e7bc (patch)
treeb3ad36486ef4cf25c29a2ae0f40f986565e52bfb
parentEvent loop: Free fds and fix race condition (diff)
downloadsway-c6f153d8f9ad6c961c8dd8e620dc2e8fcb20e7bc.tar.gz
sway-c6f153d8f9ad6c961c8dd8e620dc2e8fcb20e7bc.tar.zst
sway-c6f153d8f9ad6c961c8dd8e620dc2e8fcb20e7bc.zip
Event loop: Fix memmove and remove extraneous declaration
-rw-r--r--common/loop.c2
-rw-r--r--include/swaybar/bar.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/common/loop.c b/common/loop.c
index 54b034d9..1b174967 100644
--- a/common/loop.c
+++ b/common/loop.c
@@ -159,7 +159,7 @@ bool loop_remove_fd(struct loop *loop, int fd) {
159 159
160 loop->fd_length--; 160 loop->fd_length--;
161 memmove(&loop->fds[i], &loop->fds[i + 1], 161 memmove(&loop->fds[i], &loop->fds[i + 1],
162 sizeof(void*) * (loop->fd_length - i)); 162 sizeof(struct pollfd) * (loop->fd_length - i));
163 163
164 return true; 164 return true;
165 } 165 }
diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h
index db2d3d62..58e2dee6 100644
--- a/include/swaybar/bar.h
+++ b/include/swaybar/bar.h
@@ -9,7 +9,6 @@ struct swaybar_config;
9struct swaybar_output; 9struct swaybar_output;
10struct swaybar_workspace; 10struct swaybar_workspace;
11struct loop; 11struct loop;
12struct loop_event;
13 12
14struct swaybar_pointer { 13struct swaybar_pointer {
15 struct wl_pointer *pointer; 14 struct wl_pointer *pointer;