From: Benno Schulenberg <bensberg@justemail.net>
Date: Tue, 12 Jan 2016 20:17:05 +0000 (+0000)
Subject: Condensing the preparsing of a line.
X-Git-Tag: v2.5.2~82
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=774c8ba1bf8a562bdcb3185b16e3ab970cac15d1;p=nano.git

Condensing the preparsing of a line.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5553 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---

diff --git a/ChangeLog b/ChangeLog
index cd169619..49c80ac0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 	* src/files.c (save_poshistory, update_poshistory, check_poshistory,
 	load_poshistory): Differentiate variable name from function names.
 	* src/files.c (load_poshistory): Remove a senseless iteration.
+	* src/files.c (load_poshistory): Condense the reading of a line.
 
 GNU nano 2.5.1 - 2016.01.11
 
diff --git a/src/files.c b/src/files.c
index f494a38e..b57a51f5 100644
--- a/src/files.c
+++ b/src/files.c
@@ -3220,13 +3220,11 @@ void load_poshistory(void)
 	    poshiststruct *record_ptr = NULL, *newrecord;
 
 	    /* Read and parse each line, and store the extracted data. */
-	    while ((read = getline(&line, &buf_len, hist)) >= 0) {
-		if (read > 0 && line[read - 1] == '\n') {
-		    read--;
-		    line[read] = '\0';
-		}
-		if (read > 0)
-		    unsunder(line, read);
+	    while ((read = getline(&line, &buf_len, hist)) > 2) {
+		if (line[read - 1] == '\n')
+		    line[--read] = '\0';
+		unsunder(line, read);
+
 		lineptr = parse_next_word(line);
 		xptr = parse_next_word(lineptr);