diff options
author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-12-09 21:50:19 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-09 21:50:19 +1000 |
commit | b61a936c8060bc4ac4320a5f76fd98b5042e5e41 (patch) | |
tree | 279a5554686d6e862282c943bda50787b69711e1 /swayidle | |
parent | Merge pull request #3264 from ianyfan/resize-list (diff) | |
parent | list.c: rename free_flat_list to list_free_items_and_destroy (diff) | |
download | sway-b61a936c8060bc4ac4320a5f76fd98b5042e5e41.tar.gz sway-b61a936c8060bc4ac4320a5f76fd98b5042e5e41.tar.zst sway-b61a936c8060bc4ac4320a5f76fd98b5042e5e41.zip |
Merge pull request #3271 from ianyfan/list-cleanup
list.c: Remove list_foreach
Diffstat (limited to 'swayidle')
-rw-r--r-- | swayidle/main.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/swayidle/main.c b/swayidle/main.c index dd7d9de3..9a76e58c 100644 --- a/swayidle/main.c +++ b/swayidle/main.c | |||
@@ -365,11 +365,6 @@ static int parse_args(int argc, char *argv[]) { | |||
365 | return 0; | 365 | return 0; |
366 | } | 366 | } |
367 | 367 | ||
368 | static void register_zero_idle_timeout(void *item) { | ||
369 | struct swayidle_timeout_cmd *cmd = item; | ||
370 | register_timeout(cmd, 0); | ||
371 | } | ||
372 | |||
373 | static int handle_signal(int sig, void *data) { | 368 | static int handle_signal(int sig, void *data) { |
374 | switch (sig) { | 369 | switch (sig) { |
375 | case SIGINT: | 370 | case SIGINT: |
@@ -378,7 +373,9 @@ static int handle_signal(int sig, void *data) { | |||
378 | return 0; | 373 | return 0; |
379 | case SIGUSR1: | 374 | case SIGUSR1: |
380 | wlr_log(WLR_DEBUG, "Got SIGUSR1"); | 375 | wlr_log(WLR_DEBUG, "Got SIGUSR1"); |
381 | list_foreach(state.timeout_cmds, register_zero_idle_timeout); | 376 | for (int i = 0; i < state.timeout_cmds->length; ++i) { |
377 | register_timeout(state.timeout_cmds->items[i], 0); | ||
378 | } | ||
382 | return 1; | 379 | return 1; |
383 | } | 380 | } |
384 | assert(false); // not reached | 381 | assert(false); // not reached |
@@ -409,11 +406,6 @@ static int display_event(int fd, uint32_t mask, void *data) { | |||
409 | return count; | 406 | return count; |
410 | } | 407 | } |
411 | 408 | ||
412 | static void register_idle_timeout(void *item) { | ||
413 | struct swayidle_timeout_cmd *cmd = item; | ||
414 | register_timeout(cmd, cmd->timeout); | ||
415 | } | ||
416 | |||
417 | int main(int argc, char *argv[]) { | 409 | int main(int argc, char *argv[]) { |
418 | if (parse_args(argc, argv) != 0) { | 410 | if (parse_args(argc, argv) != 0) { |
419 | return -1; | 411 | return -1; |
@@ -458,7 +450,10 @@ int main(int argc, char *argv[]) { | |||
458 | sway_terminate(0); | 450 | sway_terminate(0); |
459 | } | 451 | } |
460 | 452 | ||
461 | list_foreach(state.timeout_cmds, register_idle_timeout); | 453 | for (int i = 0; i < state.timeout_cmds->length; ++i) { |
454 | struct swayidle_timeout_cmd *cmd = state.timeout_cmds->items[i]; | ||
455 | register_timeout(cmd, cmd->timeout); | ||
456 | } | ||
462 | 457 | ||
463 | wl_display_roundtrip(state.display); | 458 | wl_display_roundtrip(state.display); |
464 | 459 | ||