From b3076e35d60e1b75fc3006efe0e9a32e76c1d9d4 Mon Sep 17 00:00:00 2001
From: Arun Prakash Jana <engineerarun@gmail.com>
Date: Sun, 14 Jun 2020 00:31:48 +0530
Subject: [PATCH] Refactor key-val pair parsing

---
 src/nnn.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/nnn.c b/src/nnn.c
index 1b3427e9..3d07cb13 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -3010,7 +3010,7 @@ static int xlink(char *prefix, char *path, char *curfname, char *buf, int *prese
 
 static bool parsekvpair(kv **arr, char **envcpy, const uchar id, uchar *items)
 {
-	bool next = TRUE;
+	bool new = TRUE;
 	const uchar INCR = 8;
 	uint i = 0;
 	kv *kvarr = NULL;
@@ -3028,7 +3028,7 @@ static bool parsekvpair(kv **arr, char **envcpy, const uchar id, uchar *items)
 	ptr = *envcpy;
 
 	while (*ptr && i < 100) {
-		if (next) {
+		if (new) {
 			if (!(i & (INCR - 1))) {
 				kvarr = xrealloc(kvarr, sizeof(kv) * (i + INCR));
 				*arr = kvarr;
@@ -3043,13 +3043,14 @@ static bool parsekvpair(kv **arr, char **envcpy, const uchar id, uchar *items)
 				return FALSE;
 			kvarr[i].off = ptr - *envcpy;
 			++i;
+
+			new = FALSE;
 		}
 
 		if (*ptr == ';') {
 			*ptr = '\0';
-			next = TRUE;
-		} else if (next)
-			next = FALSE;
+			new = TRUE;
+		}
 
 		++ptr;
 	}