aboutsummaryrefslogtreecommitdiffstats
path: root/swayidle
diff options
context:
space:
mode:
authorLibravatar Ian Fan <ianfan0@gmail.com>2018-12-08 22:52:29 +0000
committerLibravatar Ian Fan <ianfan0@gmail.com>2018-12-09 00:37:50 +0000
commit19e831ed3da2aba75d56e46c57967bcc60442d57 (patch)
treeedaa5855087f9d6f257c5c6dcd5eda0c4cc55b02 /swayidle
parentMerge pull request #3260 from RedSoxFan/split-flatten (diff)
downloadsway-19e831ed3da2aba75d56e46c57967bcc60442d57.tar.gz
sway-19e831ed3da2aba75d56e46c57967bcc60442d57.tar.zst
sway-19e831ed3da2aba75d56e46c57967bcc60442d57.zip
list.c: Remove list_foreach
Most occurrences have been replaced by `free_flat_list` which has been moved from stringop.c to list.c. The rest have been replaced by for loops.
Diffstat (limited to 'swayidle')
-rw-r--r--swayidle/main.c19
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
368static void register_zero_idle_timeout(void *item) {
369 struct swayidle_timeout_cmd *cmd = item;
370 register_timeout(cmd, 0);
371}
372
373static int handle_signal(int sig, void *data) { 368static 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
412static void register_idle_timeout(void *item) {
413 struct swayidle_timeout_cmd *cmd = item;
414 register_timeout(cmd, cmd->timeout);
415}
416
417int main(int argc, char *argv[]) { 409int 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