From c75dfccaa86d3c0a09cd45c77b7c2594d2322e42 Mon Sep 17 00:00:00 2001 From: Davin McCall Date: Sat, 22 Jun 2019 04:03:51 +0100 Subject: [PATCH] Fix typo in function name (workding -> working) Cherry-picked from development branch. --- src/includes/proc-service.h | 2 +- src/load-service.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/includes/proc-service.h b/src/includes/proc-service.h index fcb5f8c..8aea7dd 100644 --- a/src/includes/proc-service.h +++ b/src/includes/proc-service.h @@ -249,7 +249,7 @@ class base_process_service : public service_record } // Set the working directory - void set_workding_dir(const string &working_dir_p) + void set_working_dir(const string &working_dir_p) { working_dir = working_dir_p; } diff --git a/src/load-service.cc b/src/load-service.cc index d4b653a..c74c734 100644 --- a/src/load-service.cc +++ b/src/load-service.cc @@ -648,14 +648,14 @@ service_record * dirload_service_set::load_service(const char * name) do_env_subst(command, command_offsets, do_sub_vars); auto rvalps = new process_service(this, string(name), std::move(command), command_offsets, depends); - rvalps->set_workding_dir(working_dir); + rvalps->set_working_dir(working_dir); rvalps->set_restart_interval(restart_interval, max_restarts); rvalps->set_restart_delay(restart_delay); rvalps->set_stop_timeout(stop_timeout); rvalps->set_start_timeout(start_timeout); rvalps->set_extra_termination_signal(term_signal); rvalps->set_run_as_uid_gid(run_as_uid, run_as_gid); - rvalps->set_workding_dir(working_dir); + rvalps->set_working_dir(working_dir); rvalps->set_notification_fd(readiness_fd); rvalps->set_notification_var(std::move(readiness_var)); #if USE_UTMPX @@ -668,7 +668,7 @@ service_record * dirload_service_set::load_service(const char * name) do_env_subst(command, command_offsets, do_sub_vars); auto rvalps = new bgproc_service(this, string(name), std::move(command), command_offsets, depends); - rvalps->set_workding_dir(working_dir); + rvalps->set_working_dir(working_dir); rvalps->set_pid_file(std::move(pid_file)); rvalps->set_restart_interval(restart_interval, max_restarts); rvalps->set_restart_delay(restart_delay); @@ -684,7 +684,7 @@ service_record * dirload_service_set::load_service(const char * name) auto rvalps = new scripted_service(this, string(name), std::move(command), command_offsets, depends); rvalps->set_stop_command(stop_command, stop_command_offsets); - rvalps->set_workding_dir(working_dir); + rvalps->set_working_dir(working_dir); rvalps->set_stop_timeout(stop_timeout); rvalps->set_start_timeout(start_timeout); rvalps->set_extra_termination_signal(term_signal); -- 2.25.1