Fix typo in function name (workding -> working)
authorDavin McCall <davmac@davmac.org>
Sat, 22 Jun 2019 03:03:51 +0000 (04:03 +0100)
committerDavin McCall <davmac@davmac.org>
Sat, 29 Jun 2019 04:06:31 +0000 (14:06 +1000)
Cherry-picked from development branch.

src/includes/proc-service.h
src/load-service.cc

index fcb5f8c26f89b2e7c86c8aae9c1bb7222b0a82b8..8aea7ddd3f75295a37d596525722af7bd9c3e04d 100644 (file)
@@ -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;
     }
index d4b653a44d9d36622f621758eecfad552df0895f..c74c734d2ba3fe750571c2f816ef10e3f493dccd 100644 (file)
@@ -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);