From 165da9b44791ddf495c843e066985ee6df6053f5 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@telfort.nl>
Date: Wed, 16 Feb 2022 15:54:23 +0100
Subject: [PATCH] tweaks: rename a variable, reshuffle five lines, and snip two
 comments

---
 src/text.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/text.c b/src/text.c
index 13941910..c34b3d21 100644
--- a/src/text.c
+++ b/src/text.c
@@ -2648,24 +2648,22 @@ void do_linter(void)
 			*pointer = '\0';
 			if (onelint != pointer) {
 				char *filename = NULL, *linestr = NULL, *maybecol = NULL;
-				char *message = copy_of(onelint);
+				char *complaint = copy_of(onelint);
 
 				/* The recognized format is "filename:line:column: message",
 				 * where ":column" may be absent or be ",column" instead. */
 				if ((filename = strtok(onelint, ":")) != NULL) {
 					if ((linestr = strtok(NULL, ":")) != NULL) {
 						if ((maybecol = strtok(NULL, " ")) != NULL) {
-							ssize_t linenumber, colnumber;
+							ssize_t linenumber = strtol(linestr, NULL, 10);
+							ssize_t colnumber = strtol(maybecol, NULL, 10);
 
-							linenumber = strtol(linestr, NULL, 10);
 							if (linenumber <= 0) {
+								free(complaint);
 								pointer++;
-								free(message);
 								continue;
 							}
 
-							colnumber = strtol(maybecol, NULL, 10);
-							/* Check if the middle field is in comma format. */
 							if (colnumber <= 0) {
 								strtok(linestr, ",");
 								if ((maybecol = strtok(NULL, ",")) != NULL)
@@ -2674,7 +2672,6 @@ void do_linter(void)
 									colnumber = 1;
 							}
 
-							/* Nice.  We have a lint message we can use. */
 							parsesuccess = TRUE;
 							tmplint = curlint;
 							curlint = nmalloc(sizeof(lintstruct));
@@ -2682,17 +2679,17 @@ void do_linter(void)
 							curlint->prev = tmplint;
 							if (curlint->prev != NULL)
 								curlint->prev->next = curlint;
-							curlint->msg = copy_of(strstr(message, " ") + 1);
+							curlint->filename = copy_of(filename);
 							curlint->lineno = linenumber;
 							curlint->colno = colnumber;
-							curlint->filename = copy_of(filename);
+							curlint->msg = copy_of(strstr(complaint, " ") + 1);
 
 							if (lints == NULL)
 								lints = curlint;
 						}
 					}
 				}
-				free(message);
+				free(complaint);
 			}
 			onelint = pointer + 1;
 		}