commit 64a300dd8d0fd181638cad5dfdeba7582cb92093
from: Mark Jamsek <mark@jamsek.dev>
via: Thomas Adam <thomas@xteddy.org>
date: Fri Feb 17 16:23:18 2023 UTC

garbage-collect redundant read_logmsg() parameter

As identified and suggested by stsp, with the previous commit,
'strip_comments' is now always set thus no longer needed.

ok stsp@

commit - 83389425cc9afb887c5428f2db3299a1b049d71e
commit + 64a300dd8d0fd181638cad5dfdeba7582cb92093
blob - ba0f327b841f984188a83b7108e6a90c36058f91
blob + b37b2e4c4c2c17850b7e2ec9418ca301308a5293
--- got/got.c
+++ got/got.c
@@ -389,8 +389,7 @@ doneediting:
 }
 
 static const struct got_error *
-read_logmsg(char **logmsg, size_t *len, FILE *fp, size_t filesize,
-    int strip_comments)
+read_logmsg(char **logmsg, size_t *len, FILE *fp, size_t filesize)
 {
 	const struct got_error *err = NULL;
 	char *line = NULL;
@@ -408,8 +407,7 @@ read_logmsg(char **logmsg, size_t *len, FILE *fp, size
 	(*logmsg)[0] = '\0';
 
 	while (getline(&line, &linesize, fp) != -1) {
-		if ((strip_comments && line[0] == '#') ||
-		    (*len == 0 && line[0] == '\n'))
+		if (line[0] == '#' || (*len == 0 && line[0] == '\n'))
 			continue; /* remove comments and leading empty lines */
 		*len = strlcat(*logmsg, line, filesize + 1);
 		if (*len >= filesize + 1) {
@@ -468,7 +466,7 @@ edit_logmsg(char **logmsg, const char *editor, const c
 	}
 
 	/* strip comments and leading/trailing newlines */
-	err = read_logmsg(logmsg, &logmsg_len, fp, st2.st_size, 1);
+	err = read_logmsg(logmsg, &logmsg_len, fp, st2.st_size);
 	if (err)
 		goto done;
 	if (logmsg_len == 0) {