From b6eb2f958d1ea7fd6302c3a29c5a4ec9f0023b93 Mon Sep 17 00:00:00 2001
From: Davin McCall <davmac@davmac.org>
Date: Fri, 9 Nov 2018 10:20:42 +0000
Subject: [PATCH] Wrap too-long comment lines.

---
 src/includes/baseproc-sys.h | 4 ++--
 src/includes/proc-service.h | 9 ++++++---
 src/proc-service.cc         | 3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/includes/baseproc-sys.h b/src/includes/baseproc-sys.h
index 14166be..4c65513 100644
--- a/src/includes/baseproc-sys.h
+++ b/src/includes/baseproc-sys.h
@@ -1,8 +1,8 @@
 /*
  * This header implements a namespace, bp_sys, which wraps various system calls used by baseproc-service.cc.
  *
- * When running tests, another header is substituted in place of this one. The substitute provides mocks/stubs
- * for the functions, to avoid calling the real functions and thus allow for unit-level testing.
+ * When running tests, another header is substituted in place of this one. The substitute provides
+ * mocks/stubs for the functions, to avoid calling the real functions and thus allow for unit-level testing.
  */
 
 #ifndef BPSYS_INCLUDED
diff --git a/src/includes/proc-service.h b/src/includes/proc-service.h
index a0b2f5c..a8ad6fb 100644
--- a/src/includes/proc-service.h
+++ b/src/includes/proc-service.h
@@ -8,7 +8,8 @@
 
 // Given a string and a list of pairs of (start,end) indices for each argument in that string,
 // store a null terminator for the argument. Return a `char *` vector containing the beginning
-// of each argument and a trailing nullptr. (The returned array is invalidated if the string is later modified).
+// of each argument and a trailing nullptr. (The returned array is invalidated if the string is later
+// modified).
 std::vector<const char *> separate_args(std::string &s,
         const std::list<std::pair<unsigned,unsigned>> &arg_indices);
 
@@ -42,10 +43,12 @@ class base_process_service : public service_record
 
     protected:
     string program_name;          // storage for program/script and arguments
-    std::vector<const char *> exec_arg_parts; // pointer to each argument/part of the program_name, and nullptr
+    // pointer to each argument/part of the program_name, and nullptr:
+    std::vector<const char *> exec_arg_parts;
 
     string stop_command;          // storage for stop program/script and arguments
-    std::vector<const char *> stop_arg_parts; // pointer to each argument/part of the stop_command, and nullptr
+    // pointer to each argument/part of the stop_command, and nullptr:
+    std::vector<const char *> stop_arg_parts;
 
     string working_dir;       // working directory (or empty)
 
diff --git a/src/proc-service.cc b/src/proc-service.cc
index 99e0f1e..2aa91ac 100644
--- a/src/proc-service.cc
+++ b/src/proc-service.cc
@@ -17,7 +17,8 @@
 
 // Given a string and a list of pairs of (start,end) indices for each argument in that string,
 // store a null terminator for the argument. Return a `char *` vector containing the beginning
-// of each argument and a trailing nullptr. (The returned array is invalidated if the string is later modified).
+// of each argument and a trailing nullptr. (The returned array is invalidated if the string is
+// later modified).
 std::vector<const char *> separate_args(std::string &s,
         const std::list<std::pair<unsigned,unsigned>> &arg_indices)
 {
-- 
2.25.1