From 531250af841fdb4e334f8e00ad2be9387e4ad3bc Mon Sep 17 00:00:00 2001 From: Davin McCall Date: Tue, 7 May 2019 21:59:08 +1000 Subject: [PATCH] Rename "event_loop" label to avoid name clash. --- src/dinit.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dinit.cc b/src/dinit.cc index 87ce4c1..82404b7 100644 --- a/src/dinit.cc +++ b/src/dinit.cc @@ -447,7 +447,7 @@ int dinit_main(int argc, char **argv) } } - event_loop: + run_event_loop: // Process events until all services have terminated. while (services->count_active_services() != 0) { @@ -456,7 +456,7 @@ int dinit_main(int argc, char **argv) shutdown_type_t shutdown_type = services->get_shutdown_type(); if (shutdown_type == shutdown_type_t::REMAIN) { - goto event_loop; + goto run_event_loop; } if (am_pid_one) { @@ -489,7 +489,7 @@ int dinit_main(int argc, char **argv) confirm_restart_boot(); try { services->start_service("boot"); - goto event_loop; // yes, the "evil" goto + goto run_event_loop; // yes, the "evil" goto } catch (...) { // Now what do we do? try to reboot, but wait for user ack to avoid boot loop. -- 2.25.1