Fix minor (non-bug) issues picked up by cppcheck.

diff --git a/src/includes/service.h b/src/includes/service.h
index dd709ca354f6168e259e89225009d33845634cbb..38c30989a62fa5f648a5153a3b80063f09f7175a 100644 (file)
--- a/src/includes/service.h
+++ b/src/includes/service.h
@@ -421,8 +421,8 @@ class service_record
     public:
 
     service_record(service_set *set, string name)
-        : service_state(service_state_t::STOPPED), desired_state(service_state_t::STOPPED),
-            auto_restart(false), smooth_recovery(false),
+        : service_name(name), service_state(service_state_t::STOPPED),
+            desired_state(service_state_t::STOPPED), auto_restart(false), smooth_recovery(false),
             pinned_stopped(false), pinned_started(false), waiting_for_deps(false),
             waiting_for_console(false), have_console(false), waiting_for_execstat(false),
             start_explicit(false), prop_require(false), prop_release(false), prop_failure(false),
@@ -430,7 +430,6 @@ class service_record
             start_skipped(false), force_stop(false)
     {
         services = set;
-        service_name = name;
         record_type = service_type_t::DUMMY;
         socket_perms = 0;
     }

diff --git a/src/load-service.cc b/src/load-service.cc
index 37c00bccb8b161c2e378367e97bcaee175925e3e..1252c750a0a6355b3cae6ef46546b5667a8ae92e 100644 (file)
--- a/src/load-service.cc
+++ b/src/load-service.cc
@@ -244,7 +244,7 @@ static void do_env_subst(std::string &line, std::list<std::pair<unsigned,unsigne
 // a fatal error.
 static void process_dep_dir(dirload_service_set &sset,
         const char *servicename,
-        string service_filename,
+        const string &service_filename,
         std::list<prelim_dep> &deplist, const std::string &depdirpath,
         dependency_type dep_type)
 {